From e4d2ea180daa904b4bec1980d13fed6f64c2ff13 Mon Sep 17 00:00:00 2001 From: tequ Date: Fri, 28 Nov 2025 00:00:08 +0900 Subject: [PATCH] check linker correctly used [ci-ga-cmake-verbose] --- .github/workflows/xahau-ga-nix.yml | 8 ++++++-- Builds/CMake/RippledCompiler.cmake | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/xahau-ga-nix.yml b/.github/workflows/xahau-ga-nix.yml index 71402a984..1f643ad9e 100644 --- a/.github/workflows/xahau-ga-nix.yml +++ b/.github/workflows/xahau-ga-nix.yml @@ -5,6 +5,7 @@ on: branches: ["dev", "candidate", "release"] pull_request: branches: ["dev", "candidate", "release"] + workflow_dispatch: schedule: - cron: '0 0 * * *' @@ -279,6 +280,9 @@ jobs: pipx install "conan>=2.0,<3" echo "$HOME/.local/bin" >> $GITHUB_PATH + # Add ccache PATH + echo "/usr/lib/ccache" >> $GITHUB_PATH + - name: Check environment run: | echo "PATH:" @@ -320,8 +324,8 @@ jobs: generator: Ninja configuration: ${{ matrix.configuration }} build_dir: ${{ env.build_dir }} - cc: ${{ matrix.cc }} - cxx: ${{ matrix.cxx }} + # cc: ${{ matrix.cc }} + # cxx: ${{ matrix.cxx }} compiler-id: ${{ matrix.compiler_id }} cache_version: ${{ env.CACHE_VERSION }} main_branch: ${{ env.MAIN_BRANCH_NAME }} diff --git a/Builds/CMake/RippledCompiler.cmake b/Builds/CMake/RippledCompiler.cmake index 163c82823..88f3de5fb 100644 --- a/Builds/CMake/RippledCompiler.cmake +++ b/Builds/CMake/RippledCompiler.cmake @@ -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)