Skip to content

Commit 8f023dd

Browse files
authored
Merge pull request #25881 from compnerd/caching-by-default
build: convert parameter to cached value
2 parents a9eee38 + d11f9ab commit 8f023dd

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,8 @@ macro(configure_sdk_unix name architectures)
252252
"${SWIFT_ANDROID_NDK_PATH}/toolchains/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_build}")
253253
endif()
254254
else()
255-
if(NOT SWIFT_SDK_${prefix}_ARCH_${arch}_PATH)
256-
set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")
257-
endif()
255+
set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/" CACHE STRING "CMAKE_SYSROOT for ${prefix} ${arch}")
256+
258257
if("${prefix}" STREQUAL "HAIKU")
259258
set(SWIFT_SDK_HAIKU_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "/system/develop/headers/posix" CACHE STRING "Path to C library headers")
260259
set(SWIFT_SDK_HAIKU_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "/system/develop/headers" CACHE STRING "Path to C library architecture headers")

0 commit comments

Comments
 (0)