@@ -679,7 +679,6 @@ endfunction()
679
679
# [SDK sdk]
680
680
# [ARCHITECTURE architecture]
681
681
# [DEPENDS dep1 ...]
682
- # [LINK_LIBRARIES dep1 ...]
683
682
# [FRAMEWORK_DEPENDS dep1 ...]
684
683
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
685
684
# [LLVM_LINK_COMPONENTS comp1 ...]
@@ -710,9 +709,6 @@ endfunction()
710
709
# DEPENDS
711
710
# Targets that this library depends on.
712
711
#
713
- # LINK_LIBRARIES
714
- # Libraries this library depends on.
715
- #
716
712
# FRAMEWORK_DEPENDS
717
713
# System frameworks this library depends on.
718
714
#
@@ -758,7 +754,6 @@ function(_add_swift_host_library_single target name)
758
754
INCORPORATE_OBJECT_LIBRARIES
759
755
INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
760
756
LINK_FLAGS
761
- LINK_LIBRARIES
762
757
LLVM_LINK_COMPONENTS
763
758
PRIVATE_LINK_LIBRARIES
764
759
SWIFT_COMPILE_FLAGS )
@@ -849,8 +844,6 @@ function(_add_swift_host_library_single target name)
849
844
-libc;${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY} )
850
845
endif ()
851
846
852
- # FIXME: don't actually depend on the libraries in SWIFTLIB_SINGLE_LINK_LIBRARIES,
853
- # just any swiftmodule files that are associated with them.
854
847
handle_swift_sources (
855
848
swift_object_dependency_target
856
849
swift_module_dependency_target
@@ -863,7 +856,6 @@ function(_add_swift_host_library_single target name)
863
856
${gyb_dependency_targets}
864
857
${SWIFTLIB_SINGLE_DEPENDS}
865
858
${SWIFTLIB_SINGLE_FILE_DEPENDS}
866
- ${SWIFTLIB_SINGLE_LINK_LIBRARIES}
867
859
SDK ${SWIFTLIB_SINGLE_SDK}
868
860
ARCHITECTURE ${SWIFTLIB_SINGLE_ARCHITECTURE}
869
861
MODULE_NAME ${module_name}
@@ -1011,20 +1003,6 @@ function(_add_swift_host_library_single target name)
1011
1003
"${swift_module_dependency_target} "
1012
1004
${LLVM_COMMON_DEPENDS} )
1013
1005
1014
- if ("${libkind} " STREQUAL "SHARED" )
1015
- target_link_libraries ("${target} " PRIVATE ${SWIFTLIB_SINGLE_LINK_LIBRARIES} )
1016
- else ()
1017
- target_link_libraries ("${target} " INTERFACE ${SWIFTLIB_SINGLE_LINK_LIBRARIES} )
1018
- endif ()
1019
-
1020
- # Don't add the icucore target.
1021
- set (SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU )
1022
- foreach (item ${SWIFTLIB_SINGLE_LINK_LIBRARIES} )
1023
- if (NOT "${item} " STREQUAL "icucore" )
1024
- list (APPEND SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU "${item} " )
1025
- endif ()
1026
- endforeach ()
1027
-
1028
1006
# Link against system frameworks.
1029
1007
foreach (FRAMEWORK ${SWIFTLIB_SINGLE_FRAMEWORK_DEPENDS} )
1030
1008
target_link_libraries (${target} PUBLIC "-framework ${FRAMEWORK} " )
@@ -1093,7 +1071,6 @@ function(_add_swift_host_library_single target name)
1093
1071
DEPLOYMENT_VERSION_TVOS "${SWIFTLIB_DEPLOYMENT_VERSION_TVOS} "
1094
1072
DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS} "
1095
1073
RESULT_VAR_NAME link_flags
1096
- LINK_LIBRARIES_VAR_NAME link_libraries
1097
1074
LIBRARY_SEARCH_DIRECTORIES_VAR_NAME library_search_directories
1098
1075
)
1099
1076
@@ -1172,7 +1149,7 @@ function(_add_swift_host_library_single target name)
1172
1149
# import library targets when the library was added. Use that to adjust the
1173
1150
# link libraries.
1174
1151
if (SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows )
1175
- foreach (library_list LINK_LIBRARIES PRIVATE_LINK_LIBRARIES )
1152
+ foreach (library_list PRIVATE_LINK_LIBRARIES )
1176
1153
set (import_libraries )
1177
1154
foreach (library ${SWIFTLIB_SINGLE_${library_list}} )
1178
1155
# Ensure that the library is a target. If an absolute path was given,
0 commit comments