@@ -518,7 +518,6 @@ endfunction()
518
518
# [LINK_LIBRARIES dep1 ...]
519
519
# [FRAMEWORK_DEPENDS dep1 ...]
520
520
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
521
- # [LLVM_LINK_COMPONENTS comp1 ...]
522
521
# [C_COMPILE_FLAGS flag1...]
523
522
# [SWIFT_COMPILE_FLAGS flag1...]
524
523
# [LINK_FLAGS flag1...]
@@ -564,9 +563,6 @@ endfunction()
564
563
# FRAMEWORK_DEPENDS_WEAK
565
564
# System frameworks this library depends on that should be weakly-linked.
566
565
#
567
- # LLVM_LINK_COMPONENTS
568
- # LLVM components this library depends on.
569
- #
570
566
# C_COMPILE_FLAGS
571
567
# Extra compile flags (C, C++, ObjC).
572
568
#
@@ -633,7 +629,6 @@ function(_add_swift_target_library_single target name)
633
629
INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
634
630
LINK_FLAGS
635
631
LINK_LIBRARIES
636
- LLVM_LINK_COMPONENTS
637
632
PRIVATE_LINK_LIBRARIES
638
633
SWIFT_COMPILE_FLAGS
639
634
MODULE_TARGETS )
@@ -1093,11 +1088,6 @@ function(_add_swift_target_library_single target name)
1093
1088
endforeach ()
1094
1089
endforeach ()
1095
1090
1096
- if (NOT SWIFTLIB_SINGLE_TARGET_LIBRARY )
1097
- # Call llvm_config() only for libraries that are part of the compiler.
1098
- swift_common_llvm_config ("${target} " ${SWIFTLIB_SINGLE_LLVM_LINK_COMPONENTS} )
1099
- endif ()
1100
-
1101
1091
# Collect compile and link flags for the static and non-static targets.
1102
1092
# Don't set PROPERTY COMPILE_FLAGS or LINK_FLAGS directly.
1103
1093
set (c_compile_flags ${SWIFTLIB_SINGLE_C_COMPILE_FLAGS} )
@@ -1353,7 +1343,6 @@ endfunction()
1353
1343
# [SWIFT_MODULE_DEPENDS dep1 ...]
1354
1344
# [FRAMEWORK_DEPENDS dep1 ...]
1355
1345
# [FRAMEWORK_DEPENDS_WEAK dep1 ...]
1356
- # [LLVM_LINK_COMPONENTS comp1 ...]
1357
1346
# [FILE_DEPENDS target1 ...]
1358
1347
# [TARGET_SDKS sdk1...]
1359
1348
# [C_COMPILE_FLAGS flag1...]
@@ -1432,9 +1421,6 @@ endfunction()
1432
1421
# FRAMEWORK_DEPENDS_WEAK
1433
1422
# System frameworks this library depends on that should be weak-linked
1434
1423
#
1435
- # LLVM_LINK_COMPONENTS
1436
- # LLVM components this library depends on.
1437
- #
1438
1424
# FILE_DEPENDS
1439
1425
# Additional files this library depends on.
1440
1426
#
@@ -1525,7 +1511,6 @@ function(add_swift_target_library name)
1525
1511
INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY
1526
1512
LINK_FLAGS
1527
1513
LINK_LIBRARIES
1528
- LLVM_LINK_COMPONENTS
1529
1514
PRIVATE_LINK_LIBRARIES
1530
1515
SWIFT_COMPILE_FLAGS
1531
1516
SWIFT_COMPILE_FLAGS_IOS
@@ -1943,7 +1928,6 @@ function(add_swift_target_library name)
1943
1928
LINK_LIBRARIES ${swiftlib_link_libraries}
1944
1929
FRAMEWORK_DEPENDS ${swiftlib_framework_depends_flattened}
1945
1930
FRAMEWORK_DEPENDS_WEAK ${SWIFTLIB_FRAMEWORK_DEPENDS_WEAK}
1946
- LLVM_LINK_COMPONENTS ${SWIFTLIB_LLVM_LINK_COMPONENTS}
1947
1931
FILE_DEPENDS ${SWIFTLIB_FILE_DEPENDS} ${swiftlib_module_dependency_targets}
1948
1932
C_COMPILE_FLAGS ${swiftlib_c_compile_flags_all}
1949
1933
SWIFT_COMPILE_FLAGS ${swiftlib_swift_compile_flags_all} ${swiftlib_swift_compile_flags_arch} ${swiftlib_swift_compile_private_frameworks_flag}
@@ -2267,8 +2251,7 @@ function(_add_swift_target_executable_single name)
2267
2251
SDK )
2268
2252
set (multiple_parameter_options
2269
2253
COMPILE_FLAGS
2270
- DEPENDS
2271
- LLVM_LINK_COMPONENTS )
2254
+ DEPENDS )
2272
2255
cmake_parse_arguments (SWIFTEXE_SINGLE
2273
2256
"${options} "
2274
2257
"${single_parameter_options} "
@@ -2373,8 +2356,6 @@ function(_add_swift_target_executable_single name)
2373
2356
BINARY_DIR ${SWIFT_RUNTIME_OUTPUT_INTDIR}
2374
2357
LIBRARY_DIR ${SWIFT_LIBRARY_OUTPUT_INTDIR} )
2375
2358
2376
- swift_common_llvm_config ("${name} " ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS} )
2377
-
2378
2359
# NOTE(compnerd) use the C linker language to invoke `clang` rather than
2379
2360
# `clang++` as we explicitly link against the C++ runtime. We were previously
2380
2361
# actually passing `-nostdlib++` to avoid the C++ runtime linkage.
@@ -2398,7 +2379,7 @@ function(add_swift_target_executable name)
2398
2379
cmake_parse_arguments (SWIFTEXE_TARGET
2399
2380
"EXCLUDE_FROM_ALL;;BUILD_WITH_STDLIB"
2400
2381
""
2401
- "DEPENDS;LLVM_LINK_COMPONENTS; LINK_LIBRARIES"
2382
+ "DEPENDS;LINK_LIBRARIES"
2402
2383
${ARGN} )
2403
2384
2404
2385
set (SWIFTEXE_TARGET_SOURCES ${SWIFTEXE_TARGET_UNPARSED_ARGUMENTS} )
@@ -2431,7 +2412,6 @@ function(add_swift_target_executable name)
2431
2412
${VARIANT_NAME}
2432
2413
${SWIFTEXE_TARGET_SOURCES}
2433
2414
DEPENDS ${SWIFTEXE_TARGET_DEPENDS_with_suffix}
2434
- LLVM_LINK_COMPONENTS ${SWIFTEXE_TARGET_LLVM_LINK_COMPONENTS}
2435
2415
SDK "${sdk} "
2436
2416
ARCHITECTURE "${arch} " )
2437
2417
0 commit comments