Skip to content

Commit ab33b54

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'
1 parent 2b6b3fd commit ab33b54

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ if(SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR)
954954
set(SWIFT_SWIFT_PARSER TRUE)
955955
include(${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_TARGETS})
956956

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

lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if (SWIFT_SWIFT_PARSER)
5454
# be found via RPATH.
5555
foreach (sharedlib ${SWIFT_SYNTAX_SHARED_LIBRARIES})
5656
set(add_origin_rpath)
57-
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
57+
if(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
5858
# At runtime, use swiftCore in the current toolchain.
5959
swift_get_set_rpath_script_file(setrpath_command)
6060
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)