Skip to content

Commit af6df17

Browse files
neonichubnbarham
neonichu
authored and
bnbarham
committed
Remove use of SWIFT_FORCE_* build settings (swiftlang#7464)
These haven't been relevant for a while. (cherry picked from commit ec1bfe8)
1 parent e2edcb0 commit af6df17

File tree

3 files changed

+0
-28
lines changed

3 files changed

+0
-28
lines changed

‎Sources/XCBuildSupport/PIF.swift

-2
Original file line numberDiff line numberDiff line change
@@ -941,8 +941,6 @@ public enum PIF {
941941
case INSTALL_PATH
942942
case SUPPORTS_MACCATALYST
943943
case SWIFT_SERIALIZE_DEBUGGING_OPTIONS
944-
case SWIFT_FORCE_STATIC_LINK_STDLIB
945-
case SWIFT_FORCE_DYNAMIC_LINK_STDLIB
946944
case SWIFT_INSTALL_OBJC_HEADER
947945
case SWIFT_OBJC_INTERFACE_HEADER_NAME
948946
case SWIFT_OBJC_INTERFACE_HEADER_DIR

‎Sources/XCBuildSupport/PIFBuilder.swift

-2
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,6 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
450450
settings[.EXECUTABLE_NAME] = product.name
451451
settings[.CLANG_ENABLE_MODULES] = "YES"
452452
settings[.DEFINES_MODULE] = "YES"
453-
settings[.SWIFT_FORCE_STATIC_LINK_STDLIB] = "NO"
454-
settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB] = "YES"
455453

456454
if product.type == .executable || product.type == .test {
457455
settings[.LIBRARY_SEARCH_PATHS] = [

‎Tests/XCBuildSupportTests/PIFBuilderTests.swift

-24
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,6 @@ class PIFBuilderTests: XCTestCase {
539539
XCTAssertEqual(settings[.SDKROOT], "macosx")
540540
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
541541
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
542-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
543-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
544542
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
545543
XCTAssertEqual(settings[.TARGET_NAME], "foo")
546544
XCTAssertEqual(
@@ -569,8 +567,6 @@ class PIFBuilderTests: XCTestCase {
569567
XCTAssertEqual(settings[.SDKROOT], "macosx")
570568
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
571569
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
572-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
573-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
574570
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
575571
XCTAssertEqual(settings[.TARGET_NAME], "foo")
576572
XCTAssertEqual(
@@ -616,8 +612,6 @@ class PIFBuilderTests: XCTestCase {
616612
XCTAssertEqual(settings[.SDKROOT], "macosx")
617613
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
618614
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
619-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
620-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
621615
XCTAssertEqual(settings[.TARGET_NAME], "cfoo")
622616
XCTAssertEqual(
623617
settings[.LIBRARY_SEARCH_PATHS],
@@ -649,8 +643,6 @@ class PIFBuilderTests: XCTestCase {
649643
XCTAssertEqual(settings[.SDKROOT], "macosx")
650644
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
651645
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
652-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
653-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
654646
XCTAssertEqual(settings[.TARGET_NAME], "cfoo")
655647
XCTAssertEqual(
656648
settings[.LIBRARY_SEARCH_PATHS],
@@ -688,8 +680,6 @@ class PIFBuilderTests: XCTestCase {
688680
XCTAssertEqual(settings[.PRODUCT_NAME], "bar")
689681
XCTAssertEqual(settings[.SDKROOT], "macosx")
690682
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
691-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
692-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
693683
XCTAssertEqual(settings[.SWIFT_VERSION], "4.2")
694684
XCTAssertEqual(settings[.TARGET_NAME], "bar")
695685
XCTAssertEqual(
@@ -712,8 +702,6 @@ class PIFBuilderTests: XCTestCase {
712702
XCTAssertEqual(settings[.PRODUCT_NAME], "bar")
713703
XCTAssertEqual(settings[.SDKROOT], "macosx")
714704
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
715-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
716-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
717705
XCTAssertEqual(settings[.SWIFT_VERSION], "4.2")
718706
XCTAssertEqual(settings[.TARGET_NAME], "bar")
719707
XCTAssertEqual(
@@ -755,8 +743,6 @@ class PIFBuilderTests: XCTestCase {
755743
XCTAssertEqual(settings[.PRODUCT_NAME], "cbar")
756744
XCTAssertEqual(settings[.SDKROOT], "macosx")
757745
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
758-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
759-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
760746
XCTAssertEqual(settings[.TARGET_NAME], "cbar")
761747
XCTAssertEqual(
762748
settings[.LIBRARY_SEARCH_PATHS],
@@ -784,8 +770,6 @@ class PIFBuilderTests: XCTestCase {
784770
XCTAssertEqual(settings[.PRODUCT_NAME], "cbar")
785771
XCTAssertEqual(settings[.SDKROOT], "macosx")
786772
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
787-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
788-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
789773
XCTAssertEqual(settings[.TARGET_NAME], "cbar")
790774
XCTAssertEqual(
791775
settings[.LIBRARY_SEARCH_PATHS],
@@ -922,8 +906,6 @@ class PIFBuilderTests: XCTestCase {
922906
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
923907
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
924908
XCTAssertEqual(settings[.PRODUCT_NAME], "FooTests")
925-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
926-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
927909
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
928910
XCTAssertEqual(settings[.TARGET_NAME], "FooTests")
929911
XCTAssertEqual(
@@ -972,8 +954,6 @@ class PIFBuilderTests: XCTestCase {
972954
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
973955
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
974956
XCTAssertEqual(settings[.PRODUCT_NAME], "FooTests")
975-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
976-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
977957
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
978958
XCTAssertEqual(settings[.TARGET_NAME], "FooTests")
979959
XCTAssertEqual(
@@ -1037,8 +1017,6 @@ class PIFBuilderTests: XCTestCase {
10371017
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
10381018
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
10391019
XCTAssertEqual(settings[.PRODUCT_NAME], "CFooTests")
1040-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
1041-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
10421020
XCTAssertEqual(settings[.TARGET_NAME], "CFooTests")
10431021
XCTAssertEqual(
10441022
settings[.WATCHOS_DEPLOYMENT_TARGET],
@@ -1090,8 +1068,6 @@ class PIFBuilderTests: XCTestCase {
10901068
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
10911069
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
10921070
XCTAssertEqual(settings[.PRODUCT_NAME], "CFooTests")
1093-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
1094-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
10951071
XCTAssertEqual(settings[.TARGET_NAME], "CFooTests")
10961072
XCTAssertEqual(
10971073
settings[.WATCHOS_DEPLOYMENT_TARGET],

0 commit comments

Comments
 (0)