Skip to content

Commit 7ef7ec8

Browse files
Fix Windows build warning (#1228)
1 parent ab18927 commit 7ef7ec8

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/rp2_common/pico_standard_link/CMakeLists.txt

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,20 @@ if (NOT TARGET pico_standard_link)
9696
target_link_options(pico_standard_link INTERFACE "LINKER:--gc-sections")
9797
endif()
9898

99-
# Ignore warnings about rwx segments introduced in binutils 2.39
100-
execute_process(COMMAND ${CMAKE_C_COMPILER} -print-prog-name=ld RESULT_VARIABLE RUN_C_RESULT OUTPUT_VARIABLE FULL_LD_PATH
101-
OUTPUT_STRIP_TRAILING_WHITESPACE)
102-
if (${RUN_C_RESULT} EQUAL 0)
103-
execute_process(COMMAND ${FULL_LD_PATH} --help RESULT_VARIABLE RUN_LD_RESULT OUTPUT_VARIABLE LD_HELP_OUTPUT
99+
if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
100+
# Ignore warnings about rwx segments introduced in binutils 2.39
101+
execute_process(COMMAND ${CMAKE_C_COMPILER} -print-prog-name=ld RESULT_VARIABLE RUN_C_RESULT OUTPUT_VARIABLE FULL_LD_PATH
104102
OUTPUT_STRIP_TRAILING_WHITESPACE)
105-
if (${RUN_LD_RESULT} EQUAL 0)
106-
set(RWX_WARNING "no-warn-rwx-segments")
107-
string(FIND "${LD_HELP_OUTPUT}" "${RWX_WARNING}" LD_RWX_WARNING_SUPPORTED)
108-
if (${LD_RWX_WARNING_SUPPORTED} GREATER -1)
109-
target_link_options(pico_standard_link INTERFACE "LINKER:--${RWX_WARNING}")
110-
endif()
103+
if (${RUN_C_RESULT} EQUAL 0)
104+
execute_process(COMMAND ${FULL_LD_PATH} --help RESULT_VARIABLE RUN_LD_RESULT OUTPUT_VARIABLE LD_HELP_OUTPUT
105+
OUTPUT_STRIP_TRAILING_WHITESPACE)
106+
if (${RUN_LD_RESULT} EQUAL 0)
107+
set(RWX_WARNING "no-warn-rwx-segments")
108+
string(FIND "${LD_HELP_OUTPUT}" "${RWX_WARNING}" LD_RWX_WARNING_SUPPORTED)
109+
if (${LD_RWX_WARNING_SUPPORTED} GREATER -1)
110+
target_link_options(pico_standard_link INTERFACE "LINKER:--${RWX_WARNING}")
111+
endif()
112+
endif()
111113
endif()
112114
endif()
113-
114115
endif()

0 commit comments

Comments
 (0)