remove concept of swiftImageInspectionStatic/Shared libraries
diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt
index 9e17e41..07d1e60 100644
--- a/stdlib/public/core/CMakeLists.txt
+++ b/stdlib/public/core/CMakeLists.txt
@@ -238,11 +238,6 @@
endif()
-set(shared_only_libs)
-if(SWIFT_BUILD_STATIC_STDLIB AND "${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
- list(APPEND shared_only_libs swiftImageInspectionShared)
-endif()
-
add_swift_library(swiftCore ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB IS_STDLIB_CORE
${SWIFTLIB_SOURCES}
# The copy_shim_headers target dependency is required to let the
@@ -257,6 +252,5 @@
LINK_FLAGS ${swift_core_link_flags}
PRIVATE_LINK_LIBRARIES ${swift_core_private_link_libraries}
INCORPORATE_OBJECT_LIBRARIES swiftRuntime swiftStdlibStubs
- INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY ${shared_only_libs}
FRAMEWORK_DEPENDS ${swift_core_framework_depends}
INSTALL_IN_COMPONENT stdlib)
diff --git a/stdlib/public/runtime/CMakeLists.txt b/stdlib/public/runtime/CMakeLists.txt
index 56ae09c..50de802 100644
--- a/stdlib/public/runtime/CMakeLists.txt
+++ b/stdlib/public/runtime/CMakeLists.txt
@@ -80,43 +80,34 @@
list(APPEND swift_runtime_library_compile_flags -DswiftCore_EXPORTS)
list(APPEND swift_runtime_library_compile_flags -I${SWIFT_SOURCE_DIR}/include)
-set(sdk "${SWIFT_HOST_VARIANT_SDK}")
-if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
- list(REMOVE_ITEM swift_runtime_sources ImageInspectionELF.cpp)
+if(SWIFT_BUILD_STATIC_STDLIB)
set(static_binary_lnk_file_list)
- string(TOLOWER "${sdk}" lowercase_sdk)
+ foreach(sdk ${SWIFT_SDKS})
+ if(NOT "${sdk}" STREQUAL "LINUX" AND
+ NOT "${sdk}" STREQUAL "FREEBSD" AND
+ NOT "${sdk}" STREQUAL "ANDROID")
+ continue()
+ endif()
- # These two libraries are only used with the static swiftcore
- add_swift_library(swiftImageInspectionShared STATIC
- ImageInspectionELF.cpp
- C_COMPILE_FLAGS ${swift_runtime_library_compile_flags}
- LINK_FLAGS ${swift_runtime_linker_flags})
- set_target_properties(swiftImageInspectionShared PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY "${SWIFTSTATICLIB_DIR}/${lowercase_sdk}")
+ string(TOLOWER "${sdk}" lowercase_sdk)
+ # Generate the static-executable-args.lnk file used for ELF systems (eg linux)
+ set(linkfile "${lowercase_sdk}/static-executable-args.lnk")
+ add_custom_command_target(swift_static_binary_${sdk}_args
+ COMMAND
+ "${CMAKE_COMMAND}" -E copy
+ "${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk"
+ "${SWIFTSTATICLIB_DIR}/${linkfile}"
+ OUTPUT
+ "${SWIFTSTATICLIB_DIR}/${linkfile}"
+ DEPENDS
+ "${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk")
- # Generate the static-executable-args.lnk file used for ELF systems (eg linux)
- set(linkfile "${lowercase_sdk}/static-executable-args.lnk")
- add_custom_command_target(swift_static_binary_${sdk}_args
- COMMAND
- "${CMAKE_COMMAND}" -E copy
- "${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk"
- "${SWIFTSTATICLIB_DIR}/${linkfile}"
- OUTPUT
- "${SWIFTSTATICLIB_DIR}/${linkfile}"
- DEPENDS
- "${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk")
-
- list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args})
- swift_install_in_component(stdlib
- FILES "${SWIFTSTATICLIB_DIR}/${linkfile}"
- DESTINATION "lib/swift_static/${lowercase_sdk}")
+ list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args})
+ swift_install_in_component(stdlib
+ FILES "${SWIFTSTATICLIB_DIR}/${linkfile}"
+ DESTINATION "lib/swift_static/${lowercase_sdk}")
+ endforeach()
add_custom_target(static_binary_magic ALL DEPENDS ${static_binary_lnk_file_list})
-
- add_swift_library(swiftImageInspectionShared OBJECT_LIBRARY TARGET_LIBRARY
- ImageInspectionELF.cpp
- C_COMPILE_FLAGS ${swift_runtime_library_compile_flags}
- LINK_FLAGS ${swift_runtime_linker_flags}
- INSTALL_IN_COMPONENT never_install)
endif()
add_swift_library(swiftRuntime OBJECT_LIBRARY TARGET_LIBRARY
diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt
index 9ecef9d..23ecb0a 100644
--- a/unittests/runtime/CMakeLists.txt
+++ b/unittests/runtime/CMakeLists.txt
@@ -1,11 +1,6 @@
if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "${SWIFT_PRIMARY_VARIANT_ARCH}"))
- set(swift_runtime_test_extra_libraries)
- if(SWIFT_BUILD_STATIC_STDLIB AND "${SWIFT_HOST_VARIANT_SDK}" STREQUAL "LINUX")
- list(APPEND swift_runtime_test_extra_libraries swiftImageInspectionShared)
- endif()
-
add_subdirectory(LongTests)
set(PLATFORM_SOURCES)
@@ -51,7 +46,6 @@
target_link_libraries(SwiftRuntimeTests
swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX}
${PLATFORM_TARGET_LINK_LIBRARIES}
- ${swift_runtime_test_extra_libraries}
)
endif()
diff --git a/utils/gen-static-stdlib-link-args b/utils/gen-static-stdlib-link-args
index 28e5123..6fbc663 100755
--- a/utils/gen-static-stdlib-link-args
+++ b/utils/gen-static-stdlib-link-args
@@ -64,7 +64,6 @@
-latomic
-lswiftCore
-latomic
--lswiftImageInspectionShared
$ICU_LIBS
-Xlinker
-export-dynamic
diff --git a/utils/static-executable-args.lnk b/utils/static-executable-args.lnk
index 2c158a4..0d34ebd 100644
--- a/utils/static-executable-args.lnk
+++ b/utils/static-executable-args.lnk
@@ -1,6 +1,5 @@
-static
-lswiftCore
--lswiftImageInspectionStatic
-Xlinker
--defsym=__import_pthread_self=pthread_self
-Xlinker
