Skip to content

Commit b70b2b1

Browse files
committed
build: remove INCORPORATE_OBJECT_LIBRARIES from _add_swift_host_library_single
1 parent 36193c3 commit b70b2b1

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,6 @@ function(_add_swift_host_library_single target name)
732732
set(SWIFTLIB_SINGLE_multiple_parameter_options
733733
FILE_DEPENDS
734734
GYB_SOURCES
735-
INCORPORATE_OBJECT_LIBRARIES
736735
INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
737736
LLVM_LINK_COMPONENTS
738737
SWIFT_COMPILE_FLAGS)
@@ -872,21 +871,13 @@ function(_add_swift_host_library_single target name)
872871
return()
873872
endif()
874873

875-
set(SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS)
876-
foreach(object_library ${SWIFTLIB_SINGLE_INCORPORATE_OBJECT_LIBRARIES})
877-
list(APPEND SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS
878-
$<TARGET_OBJECTS:${object_library}${VARIANT_SUFFIX}>)
879-
endforeach()
880-
881874
set(SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY)
882875
foreach(object_library ${SWIFTLIB_SINGLE_INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY})
883876
list(APPEND SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY
884877
$<TARGET_OBJECTS:${object_library}${VARIANT_SUFFIX}>)
885878
endforeach()
886879

887-
set(SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES)
888-
889-
set(INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})
880+
set(INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS)
890881
if(${libkind} STREQUAL "SHARED")
891882
list(APPEND INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS
892883
${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY})
@@ -895,8 +886,7 @@ function(_add_swift_host_library_single target name)
895886
add_library("${target}" ${libkind}
896887
${SWIFTLIB_SINGLE_SOURCES}
897888
${SWIFTLIB_SINGLE_EXTERNAL_SOURCES}
898-
${INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}
899-
${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES})
889+
${INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})
900890
_set_target_prefix_and_suffix("${target}" "${libkind}" "${SWIFTLIB_SINGLE_SDK}")
901891

902892
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "WINDOWS")

0 commit comments

Comments
 (0)