Compare commits

...

3 Commits

Author SHA1 Message Date
tequ
7f8eac93db enable linker on release-builder 2025-11-28 00:25:13 +09:00
tequ
0b896d34e3 try revert fix 2025-11-28 00:15:05 +09:00
tequ
e4d2ea180d check linker correctly used [ci-ga-cmake-verbose] 2025-11-28 00:10:33 +09:00
3 changed files with 5 additions and 6 deletions

View File

@@ -149,6 +149,7 @@ if (use_gold AND is_gcc)
required to make gold play nicely with jemalloc.
#]=========================================================]
if (("${LD_VERSION}" MATCHES "GNU gold") AND (NOT jemalloc))
message(STATUS "Using gold linker")
target_link_libraries (common
INTERFACE
-fuse-ld=gold
@@ -170,6 +171,7 @@ if (use_lld)
COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=lld -Wl,--version
ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
if ("${LD_VERSION}" MATCHES "LLD")
message(STATUS "Using lld linker")
target_link_libraries (common INTERFACE -fuse-ld=lld)
endif ()
unset (LD_VERSION)

View File

@@ -67,9 +67,8 @@ fi
# Environment setup moved to Dockerfile in release-builder.sh
source /opt/rh/gcc-toolset-11/enable
export PATH=/usr/local/bin:$PATH
export CC='ccache gcc' &&
export CXX='ccache g++' &&
echo "-- Build Rippled --" &&
export PATH=/usr/lib/ccache:$PATH
echo "-- Build Rippled --"
pwd &&
echo "MOVING TO [ build-core.sh ]";

View File

@@ -128,9 +128,6 @@ ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++"
ENV LLVM_DIR=/usr/lib64/llvm14/lib/cmake/llvm
ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a
ENV CC='ccache gcc'
ENV CXX='ccache g++'
# Install LLD
RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
cd /tmp && \
@@ -189,6 +186,7 @@ RUN cd /tmp && \
# Set environment variables
ENV PATH=/usr/local/bin:$PATH
ENV PATH=/usr/lib/ccache:$PATH
# Configure ccache and Conan 2
# NOTE: Using echo commands instead of heredocs because heredocs in Docker RUN commands are finnicky