From 547a5214a8c34e780181dd3d34aeaf6e9c69781a Mon Sep 17 00:00:00 2001 From: "Brian C. Van Essen" Date: Tue, 25 Jun 2024 22:37:47 -0700 Subject: [PATCH] Do not use gold linker for core dependencies because protobuf fails. --- scripts/superbuild/ci/ci_pascal_env.sh | 3 ++- scripts/superbuild/ci/ci_tioga_core_dependencies.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/superbuild/ci/ci_pascal_env.sh b/scripts/superbuild/ci/ci_pascal_env.sh index aab7f1945d..be049453b3 100644 --- a/scripts/superbuild/ci/ci_pascal_env.sh +++ b/scripts/superbuild/ci/ci_pascal_env.sh @@ -32,7 +32,8 @@ EXTRA_CXX_FLAGS="-O2 -g3 -Wno-deprecated-declarations" EXTRA_CUDA_FLAGS="-O2 -g3 -Wno-deprecated-declarations" # Prefer RPATH to RUNPATH (stability over flexibility) -EXTRA_LINK_FLAGS="-fuse-ld=gold -Wl,--disable-new-dtags" +EXTRA_LINK_FLAGS_CORE="-Wl,--disable-new-dtags" +EXTRA_LINK_FLAGS="-fuse-ld=gold ${EXTRA_LINK_FLAGS_CORE}" # Set this to the CUDA GPU arch(s) to support (example set for Lassen/Sierra) CUDA_GPU_ARCH=60 diff --git a/scripts/superbuild/ci/ci_tioga_core_dependencies.sh b/scripts/superbuild/ci/ci_tioga_core_dependencies.sh index 2aab738031..27ffacab51 100755 --- a/scripts/superbuild/ci/ci_tioga_core_dependencies.sh +++ b/scripts/superbuild/ci/ci_tioga_core_dependencies.sh @@ -76,8 +76,8 @@ cmake \ \ -D BUILD_SHARED_LIBS=ON \ -D CMAKE_POSITION_INDEPENDENT_CODE=ON \ - -D CMAKE_EXE_LINKER_FLAGS="${EXTRA_LINK_FLAGS}" \ - -D CMAKE_SHARED_LINKER_FLAGS="${EXTRA_LINK_FLAGS}" \ + -D CMAKE_EXE_LINKER_FLAGS="${EXTRA_LINK_FLAGS_CORE}" \ + -D CMAKE_SHARED_LINKER_FLAGS="${EXTRA_LINK_FLAGS_CORE}" \ \ -D CMAKE_CXX_STANDARD=17 \ -D CMAKE_HIP_STANDARD=17 \