Skip to content

Commit ec1bfe8

Browse files
neonichuneonichu
authored
Remove use of SWIFT_FORCE_* build settings (#7464)
These haven't been relevant for a while.
1 parent 36a3339 commit ec1bfe8

File tree

3 files changed

+0
-28
lines changed

3 files changed

+0
-28
lines changed

‎Sources/XCBuildSupport/PIF.swift‎

Lines changed: 0 additions & 2 deletions
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‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,6 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
432432
settings[.EXECUTABLE_NAME] = product.name
433433
settings[.CLANG_ENABLE_MODULES] = "YES"
434434
settings[.DEFINES_MODULE] = "YES"
435-
settings[.SWIFT_FORCE_STATIC_LINK_STDLIB] = "NO"
436-
settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB] = "YES"
437435

438436
if product.type == .executable || product.type == .test {
439437
settings[.LIBRARY_SEARCH_PATHS] = ["$(inherited)", "\(parameters.toolchainLibDir.pathString)/swift/macosx"]

‎Tests/XCBuildSupportTests/PIFBuilderTests.swift‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,6 @@ class PIFBuilderTests: XCTestCase {
500500
XCTAssertEqual(settings[.SDKROOT], "macosx")
501501
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
502502
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
503-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
504-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
505503
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
506504
XCTAssertEqual(settings[.TARGET_NAME], "foo")
507505
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
@@ -524,8 +522,6 @@ class PIFBuilderTests: XCTestCase {
524522
XCTAssertEqual(settings[.SDKROOT], "macosx")
525523
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
526524
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
527-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
528-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
529525
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
530526
XCTAssertEqual(settings[.TARGET_NAME], "foo")
531527
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
@@ -562,8 +558,6 @@ class PIFBuilderTests: XCTestCase {
562558
XCTAssertEqual(settings[.SDKROOT], "macosx")
563559
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
564560
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
565-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
566-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
567561
XCTAssertEqual(settings[.TARGET_NAME], "cfoo")
568562
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
569563
}
@@ -586,8 +580,6 @@ class PIFBuilderTests: XCTestCase {
586580
XCTAssertEqual(settings[.SDKROOT], "macosx")
587581
XCTAssertEqual(settings[.SKIP_INSTALL], "NO")
588582
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
589-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
590-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
591583
XCTAssertEqual(settings[.TARGET_NAME], "cfoo")
592584
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
593585
}
@@ -622,8 +614,6 @@ class PIFBuilderTests: XCTestCase {
622614
XCTAssertEqual(settings[.PRODUCT_NAME], "bar")
623615
XCTAssertEqual(settings[.SDKROOT], "macosx")
624616
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
625-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
626-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
627617
XCTAssertEqual(settings[.SWIFT_VERSION], "4.2")
628618
XCTAssertEqual(settings[.TARGET_NAME], "bar")
629619
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
@@ -643,8 +633,6 @@ class PIFBuilderTests: XCTestCase {
643633
XCTAssertEqual(settings[.PRODUCT_NAME], "bar")
644634
XCTAssertEqual(settings[.SDKROOT], "macosx")
645635
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
646-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
647-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
648636
XCTAssertEqual(settings[.SWIFT_VERSION], "4.2")
649637
XCTAssertEqual(settings[.TARGET_NAME], "bar")
650638
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
@@ -680,8 +668,6 @@ class PIFBuilderTests: XCTestCase {
680668
XCTAssertEqual(settings[.PRODUCT_NAME], "cbar")
681669
XCTAssertEqual(settings[.SDKROOT], "macosx")
682670
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
683-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
684-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
685671
XCTAssertEqual(settings[.TARGET_NAME], "cbar")
686672
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
687673
}
@@ -703,8 +689,6 @@ class PIFBuilderTests: XCTestCase {
703689
XCTAssertEqual(settings[.PRODUCT_NAME], "cbar")
704690
XCTAssertEqual(settings[.SDKROOT], "macosx")
705691
XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"])
706-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
707-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
708692
XCTAssertEqual(settings[.TARGET_NAME], "cbar")
709693
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"])
710694
}
@@ -835,8 +819,6 @@ class PIFBuilderTests: XCTestCase {
835819
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
836820
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
837821
XCTAssertEqual(settings[.PRODUCT_NAME], "FooTests")
838-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
839-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
840822
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
841823
XCTAssertEqual(settings[.TARGET_NAME], "FooTests")
842824
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString)
@@ -868,8 +850,6 @@ class PIFBuilderTests: XCTestCase {
868850
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
869851
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
870852
XCTAssertEqual(settings[.PRODUCT_NAME], "FooTests")
871-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
872-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
873853
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
874854
XCTAssertEqual(settings[.TARGET_NAME], "FooTests")
875855
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString)
@@ -916,8 +896,6 @@ class PIFBuilderTests: XCTestCase {
916896
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
917897
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
918898
XCTAssertEqual(settings[.PRODUCT_NAME], "CFooTests")
919-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
920-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
921899
XCTAssertEqual(settings[.TARGET_NAME], "CFooTests")
922900
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString)
923901
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .iOS).versionString)
@@ -952,8 +930,6 @@ class PIFBuilderTests: XCTestCase {
952930
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
953931
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
954932
XCTAssertEqual(settings[.PRODUCT_NAME], "CFooTests")
955-
XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES")
956-
XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO")
957933
XCTAssertEqual(settings[.TARGET_NAME], "CFooTests")
958934
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString)
959935
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .iOS).versionString)

0 commit comments

Comments
 (0)