@@ -269,7 +269,7 @@ function(_add_variant_link_flags)
269
269
set (oneValueArgs SDK ARCH BUILD_TYPE ENABLE_ASSERTIONS ANALYZE_CODE_COVERAGE
270
270
DEPLOYMENT_VERSION_IOS RESULT_VAR_NAME ENABLE_LTO LTO_OBJECT_NAME )
271
271
cmake_parse_arguments (LFLAGS
272
- ""
272
+ "IS_STDLIB "
273
273
"${oneValueArgs} "
274
274
""
275
275
${ARGN} )
@@ -309,6 +309,9 @@ function(_add_variant_link_flags)
309
309
"-ldl"
310
310
"-L${SWIFT_ANDROID_NDK_PATH} /toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION} /prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/${SWIFT_ANDROID_NDK_GCC_VERSION} .x"
311
311
"${SWIFT_ANDROID_NDK_PATH} /sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so" )
312
+ if (LFLAGS_IS_STDLIB )
313
+ list (APPEND result "-shared" )
314
+ endif ()
312
315
else ()
313
316
list (APPEND result "-lobjc" )
314
317
@@ -957,6 +960,7 @@ function(_add_swift_library_single target name)
957
960
ENABLE_LTO "${lto_type} "
958
961
LTO_OBJECT_NAME "${target} -${SWIFTLIB_SINGLE_SDK} -${SWIFTLIB_SINGLE_ARCHITECTURE} "
959
962
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS} "
963
+ ${SWIFTLIB_SINGLE_IS_STDLIB_keyword}
960
964
RESULT_VAR_NAME link_flags
961
965
)
962
966
@@ -1450,9 +1454,12 @@ function(add_swift_library name)
1450
1454
if ("${sdk} " STREQUAL "WINDOWS" )
1451
1455
set (UNIVERSAL_LIBRARY_NAME
1452
1456
"${SWIFTLIB_DIR} /${SWIFT_SDK_${sdk} _LIB_SUBDIR}/${name} .dll" )
1453
- else ( )
1457
+ elseif ( " ${sdk} " IN_LIST SWIFT_APPLE_PLATFORMS )
1454
1458
set (UNIVERSAL_LIBRARY_NAME
1455
1459
"${SWIFTLIB_DIR} /${SWIFT_SDK_${sdk} _LIB_SUBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${name}${CMAKE_SHARED_LIBRARY_SUFFIX} " )
1460
+ else ()
1461
+ set (UNIVERSAL_LIBRARY_NAME
1462
+ "${SWIFTLIB_DIR} /${SWIFT_SDK_${sdk} _LIB_SUBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${name} .so" )
1456
1463
endif ()
1457
1464
else ()
1458
1465
if ("${sdk} " STREQUAL "WINDOWS" )
0 commit comments