From 904744bd72f87f0bff1f517038c98a3f999c0376 Mon Sep 17 00:00:00 2001 From: Michael Moss Date: Fri, 20 Mar 2026 04:57:11 -0700 Subject: [PATCH] Fix `--gc-sections` linking error on github macos-15-x86_64. This forces `CMAKE_REQUIRED_FLAGS` to be treated as a string instead of list, so none of the args get dropped when passed through `check_c_source_compiles`. PiperOrigin-RevId: 886717366 Change-Id: I6314f9bfabd9d62bdcad5070c8801c453c381b79 --- cmake/MujocoLinkOptions.cmake | 4 ++-- sample/cmake/MujocoLinkOptions.cmake | 4 ++-- simulate/cmake/MujocoLinkOptions.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/MujocoLinkOptions.cmake b/cmake/MujocoLinkOptions.cmake index 48db60d2..4bed36c2 100644 --- a/cmake/MujocoLinkOptions.cmake +++ b/cmake/MujocoLinkOptions.cmake @@ -43,12 +43,12 @@ function(get_mujoco_extra_link_options OUTPUT_VAR) endif() endif() - set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,--gc-sections") + set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,--gc-sections") check_c_source_compiles("int main() {}" SUPPORTS_GC_SECTIONS) if(SUPPORTS_GC_SECTIONS) set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,--gc-sections) else() - set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,-dead_strip") + set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,-dead_strip") check_c_source_compiles("int main() {}" SUPPORTS_DEAD_STRIP) if(SUPPORTS_DEAD_STRIP) set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,-dead_strip) diff --git a/sample/cmake/MujocoLinkOptions.cmake b/sample/cmake/MujocoLinkOptions.cmake index 48db60d2..4bed36c2 100644 --- a/sample/cmake/MujocoLinkOptions.cmake +++ b/sample/cmake/MujocoLinkOptions.cmake @@ -43,12 +43,12 @@ function(get_mujoco_extra_link_options OUTPUT_VAR) endif() endif() - set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,--gc-sections") + set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,--gc-sections") check_c_source_compiles("int main() {}" SUPPORTS_GC_SECTIONS) if(SUPPORTS_GC_SECTIONS) set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,--gc-sections) else() - set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,-dead_strip") + set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,-dead_strip") check_c_source_compiles("int main() {}" SUPPORTS_DEAD_STRIP) if(SUPPORTS_DEAD_STRIP) set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,-dead_strip) diff --git a/simulate/cmake/MujocoLinkOptions.cmake b/simulate/cmake/MujocoLinkOptions.cmake index 48db60d2..4bed36c2 100644 --- a/simulate/cmake/MujocoLinkOptions.cmake +++ b/simulate/cmake/MujocoLinkOptions.cmake @@ -43,12 +43,12 @@ function(get_mujoco_extra_link_options OUTPUT_VAR) endif() endif() - set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,--gc-sections") + set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,--gc-sections") check_c_source_compiles("int main() {}" SUPPORTS_GC_SECTIONS) if(SUPPORTS_GC_SECTIONS) set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,--gc-sections) else() - set(CMAKE_REQUIRED_FLAGS ${EXTRA_LINK_OPTIONS} "-Wl,-dead_strip") + set(CMAKE_REQUIRED_FLAGS "${EXTRA_LINK_OPTIONS} -Wl,-dead_strip") check_c_source_compiles("int main() {}" SUPPORTS_DEAD_STRIP) if(SUPPORTS_DEAD_STRIP) set(EXTRA_LINK_OPTIONS ${EXTRA_LINK_OPTIONS} -Wl,-dead_strip)