Skip to content

Commit b8f7254

Browse files
committed
Revert "[gardening] Remove unused code."
This reverts commit 141f68a. Although it appears as if the code is unused, in reality this variable must be set in order to be referenced elsewhere as `${SWIFT_SDK_${CFLAGS_SDK}_PATH}`.
1 parent f118339 commit b8f7254

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,9 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
458458
is_sdk_requested(ANDROID swift_build_android)
459459
if(swift_build_android AND ${swift_can_crosscompile_stdlib})
460460
configure_sdk_unix(ANDROID "Android" "android" "android" "armv7" "armv7-none-linux-androideabi")
461+
# This must be set, as variables such as "${SWIFT_SDK_${sdk}_PATH}" are
462+
# referenced in several other locations.
463+
set(SWIFT_SDK_ANDROID_PATH "${SWIFT_ANDROID_SDK_PATH}")
461464

462465
set(SWIFT_PRIMARY_VARIANT_SDK_default "ANDROID")
463466
set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv7")

0 commit comments

Comments
 (0)