Skip to content

Commit b31581c

Browse files
committed
CMake: rename an obscure IS_HOST flag to HOST_LIBRARY
1 parent 545042d commit b31581c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,8 @@ endfunction()
443443
function(_add_swift_library_single target name)
444444
set(SWIFTLIB_SINGLE_options
445445
SHARED IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY
446-
API_NOTES_NON_OVERLAY DONT_EMBED_BITCODE TARGET_LIBRARY)
446+
TARGET_LIBRARY HOST_LIBRARY
447+
API_NOTES_NON_OVERLAY DONT_EMBED_BITCODE)
447448
cmake_parse_arguments(SWIFTLIB_SINGLE
448449
"${SWIFTLIB_SINGLE_options}"
449450
"SDK;ARCHITECTURE;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_IOS"
@@ -980,7 +981,8 @@ endfunction()
980981
# Sources to add into this library.
981982
function(add_swift_library name)
982983
set(SWIFTLIB_options
983-
SHARED IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY TARGET_LIBRARY IS_HOST
984+
SHARED IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY
985+
TARGET_LIBRARY HOST_LIBRARY
984986
API_NOTES_NON_OVERLAY DONT_EMBED_BITCODE HAS_SWIFT_CONTENT)
985987
cmake_parse_arguments(SWIFTLIB
986988
"${SWIFTLIB_options}"
@@ -1061,8 +1063,10 @@ function(add_swift_library name)
10611063
# SDKs building the variants of this library.
10621064
list_intersect(
10631065
"${SWIFTLIB_TARGET_SDKS}" "${SWIFT_SDKS}" SWIFTLIB_TARGET_SDKS)
1064-
if(SWIFTLIB_IS_HOST)
1065-
list_union("${SWIFTLIB_TARGET_SDKS}" "${SWIFT_HOST_VARIANT_SDK}" SWIFTLIB_TARGET_SDKS)
1066+
if(SWIFTLIB_HOST_LIBRARY)
1067+
list_union(
1068+
"${SWIFTLIB_TARGET_SDKS}" "${SWIFT_HOST_VARIANT_SDK}"
1069+
SWIFTLIB_TARGET_SDKS)
10661070
endif()
10671071
foreach(sdk ${SWIFTLIB_TARGET_SDKS})
10681072
set(THIN_INPUT_TARGETS)

stdlib/public/Reflection/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_swift_library(swiftReflection TARGET_LIBRARY IS_HOST
1+
add_swift_library(swiftReflection TARGET_LIBRARY HOST_LIBRARY
22
Demangle.cpp
33
MetadataSource.cpp
44
Remangle.cpp

0 commit comments

Comments
 (0)