Skip to content

Commit 756bc50

Browse files
committed
build: correct variable in SDK configuration
The variable was supported to be set to the triple, except it was set to the variable itself, effectively setting the variable to nothing. This is needed to clear the path to directory style installation for non-Apple targets.
1 parent 7372a25 commit 756bc50

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ macro(configure_sdk_unix name architectures)
374374

375375
# If the module triple wasn't set explicitly, it's the same as the triple.
376376
if(NOT SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE)
377-
set(SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE "${SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE}")
377+
set(SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE "${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}")
378378
endif()
379379
endforeach()
380380

@@ -407,7 +407,7 @@ macro(configure_sdk_windows name environment architectures)
407407
"${arch}-unknown-windows-${environment}")
408408
endif()
409409

410-
set(SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE "${SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE}")
410+
set(SWIFT_SDK_${prefix}_ARCH_${arch}_MODULE "${SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE}")
411411

412412
# NOTE: set the path to / to avoid a spurious `--sysroot` from being passed
413413
# to the driver -- rely on the `INCLUDE` AND `LIB` environment variables

0 commit comments

Comments
 (0)