Skip to content

Commit 443e761

Browse files
Fixes on linker executable variables per target.
* `prefix` should be `sdk` in runtime cmake list file * typo on variable existence checking
1 parent 159a424 commit 443e761

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function(_report_sdk prefix)
2323
message(STATUS " Architectures: ${SWIFT_SDK_${prefix}_ARCHITECTURES}")
2424
message(STATUS " Object Format: ${SWIFT_SDK_${prefix}_OBJECT_FORMAT}")
2525
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
26-
if(${SWIFT_SDK_${prefix}_ARCH_${arch}_LINKER})
26+
if(SWIFT_SDK_${prefix}_ARCH_${arch}_LINKER)
2727
message(STATUS " Linker (${arch}): ${SWIFT_SDK_${prefix}_ARCH_${arch}_LINKER}")
2828
else()
2929
message(STATUS " Linker (${arch}): ${CMAKE_LINKER}")

stdlib/public/runtime/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ foreach(sdk ${ELFISH_SDKS})
165165
set(section_magic_end_obj "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/section_magic_end-${arch_suffix}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}")
166166

167167
set(ld_EXECUTABLE ${CMAKE_LINKER})
168-
if(${SWIFT_SDK_${prefix}_ARCH_${arch}_LINKER})
169-
set(ld_EXECUTABLE ${SWIFT_SDK_${prefix}_ARCH_${arch}_LINKER})
168+
if(SWIFT_SDK_${sdk}_ARCH_${arch}_LINKER)
169+
set(ld_EXECUTABLE ${SWIFT_SDK_${sdk}_ARCH_${arch}_LINKER})
170170
endif()
171171

172172
add_custom_command_target(section_magic_${arch_suffix}_begin_object

0 commit comments

Comments
 (0)