Skip to content

Commit 462badb

Browse files
committed
[CMake] Update host platform check for macro support
"Support Macros in Linux" patches was inconsistent with checking platforms. Some only checked 'LINUX' but some matches 'LINUX|ANDROID|OPENBSD|FREEBSD'. Although I don't have tested other platoforms than Linux at all, there's no reason to limit it to Linux. So use the consistent check to match 'LINUX|ANDROID|OPENBSD|FREEBSD' (cherry picked from commit 8049922) (cherry picked from commit 714589e)
1 parent 704987e commit 462badb

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
959959
set(SWIFT_SWIFT_PARSER TRUE)
960960
include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
961961

962-
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
962+
if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD" AND NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
963963
# Only "HOSTTOOLS" is supported in Linux when Swift parser integration is enabled.
964964
message(WARNING "Force setting BOOTSTRAPPING=HOSTTOOLS because Swift parser integration is enabled")
965965
set(BOOTSTRAPPING_MODE "HOSTTOOLS")

cmake/modules/AddPureSwift.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function(_add_host_swift_compile_options name)
6666
endfunction()
6767

6868
function(_set_pure_swift_link_flags name relpath_to_lib_dir)
69-
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
69+
if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
7070
# Don't add builder's stdlib RPATH automatically.
7171
target_compile_options(${name} PRIVATE
7272
$<$<COMPILE_LANGUAGE:Swift>:-no-toolchain-stdlib-rpath>
@@ -291,7 +291,7 @@ function(add_pure_swift_host_tool name)
291291
set_property(TARGET ${name}
292292
APPEND PROPERTY INSTALL_RPATH
293293
"@executable_path/../lib/swift/host")
294-
else()
294+
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
295295
set_property(TARGET ${name}
296296
APPEND PROPERTY INSTALL_RPATH
297297
"$ORIGIN/../lib/swift/host")

lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if (SWIFT_SWIFT_PARSER)
5757
# be found via RPATH.
5858
foreach (sharedlib ${SWIFT_SYNTAX_SHARED_LIBRARIES})
5959
set(add_origin_rpath)
60-
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
60+
if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
6161
# At runtime, use swiftCore in the current toolchain.
6262
swift_get_set_rpath_script_file(setrpath_command)
6363
set(add_origin_rpath COMMAND ${CMAKE_COMMAND}

lib/Macros/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function(add_swift_macro_library name)
3939
_set_pure_swift_link_flags(${name} "${relpath_to_lib}")
4040

4141
# Add rpath to 'lib/host'
42-
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
42+
if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
4343
set_property(TARGET ${name}
4444
APPEND PROPERTY INSTALL_RPATH "$ORIGIN/..")
4545
endif()

0 commit comments

Comments
 (0)