From 7236bb58e51962ba2cddd36513b0857eeb1fffaf Mon Sep 17 00:00:00 2001 From: Boris Buegling Date: Tue, 16 Apr 2024 16:36:33 -0700 Subject: [PATCH] Remove use of `SWIFT_FORCE_*` build settings These haven't been relevant for a while. --- Sources/XCBuildSupport/PIF.swift | 2 -- Sources/XCBuildSupport/PIFBuilder.swift | 2 -- .../XCBuildSupportTests/PIFBuilderTests.swift | 24 ------------------- 3 files changed, 28 deletions(-) diff --git a/Sources/XCBuildSupport/PIF.swift b/Sources/XCBuildSupport/PIF.swift index 2029bddca49..37953654c70 100644 --- a/Sources/XCBuildSupport/PIF.swift +++ b/Sources/XCBuildSupport/PIF.swift @@ -941,8 +941,6 @@ public enum PIF { case INSTALL_PATH case SUPPORTS_MACCATALYST case SWIFT_SERIALIZE_DEBUGGING_OPTIONS - case SWIFT_FORCE_STATIC_LINK_STDLIB - case SWIFT_FORCE_DYNAMIC_LINK_STDLIB case SWIFT_INSTALL_OBJC_HEADER case SWIFT_OBJC_INTERFACE_HEADER_NAME case SWIFT_OBJC_INTERFACE_HEADER_DIR diff --git a/Sources/XCBuildSupport/PIFBuilder.swift b/Sources/XCBuildSupport/PIFBuilder.swift index 986f9058085..3d77fd3b95d 100644 --- a/Sources/XCBuildSupport/PIFBuilder.swift +++ b/Sources/XCBuildSupport/PIFBuilder.swift @@ -432,8 +432,6 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder { settings[.EXECUTABLE_NAME] = product.name settings[.CLANG_ENABLE_MODULES] = "YES" settings[.DEFINES_MODULE] = "YES" - settings[.SWIFT_FORCE_STATIC_LINK_STDLIB] = "NO" - settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB] = "YES" if product.type == .executable || product.type == .test { settings[.LIBRARY_SEARCH_PATHS] = ["$(inherited)", "\(parameters.toolchainLibDir.pathString)/swift/macosx"] diff --git a/Tests/XCBuildSupportTests/PIFBuilderTests.swift b/Tests/XCBuildSupportTests/PIFBuilderTests.swift index c03033ecb9f..fa17ea9ebb8 100644 --- a/Tests/XCBuildSupportTests/PIFBuilderTests.swift +++ b/Tests/XCBuildSupportTests/PIFBuilderTests.swift @@ -500,8 +500,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SKIP_INSTALL], "NO") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.SWIFT_VERSION], "5") XCTAssertEqual(settings[.TARGET_NAME], "foo") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) @@ -524,8 +522,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SKIP_INSTALL], "NO") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.SWIFT_VERSION], "5") XCTAssertEqual(settings[.TARGET_NAME], "foo") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) @@ -562,8 +558,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SKIP_INSTALL], "NO") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.TARGET_NAME], "cfoo") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) } @@ -586,8 +580,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SKIP_INSTALL], "NO") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.TARGET_NAME], "cfoo") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) } @@ -622,8 +614,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_NAME], "bar") XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.SWIFT_VERSION], "4.2") XCTAssertEqual(settings[.TARGET_NAME], "bar") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) @@ -643,8 +633,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_NAME], "bar") XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.SWIFT_VERSION], "4.2") XCTAssertEqual(settings[.TARGET_NAME], "bar") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) @@ -680,8 +668,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_NAME], "cbar") XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.TARGET_NAME], "cbar") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) } @@ -703,8 +689,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_NAME], "cbar") XCTAssertEqual(settings[.SDKROOT], "macosx") XCTAssertEqual(settings[.SUPPORTED_PLATFORMS], ["macosx", "linux"]) - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.TARGET_NAME], "cbar") XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], ["$(inherited)", "/toolchain/lib/swift/macosx"]) } @@ -835,8 +819,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests") XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests") XCTAssertEqual(settings[.PRODUCT_NAME], "FooTests") - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.SWIFT_VERSION], "5") XCTAssertEqual(settings[.TARGET_NAME], "FooTests") XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString) @@ -868,8 +850,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests") XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests") XCTAssertEqual(settings[.PRODUCT_NAME], "FooTests") - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.SWIFT_VERSION], "5") XCTAssertEqual(settings[.TARGET_NAME], "FooTests") XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString) @@ -916,8 +896,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests") XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests") XCTAssertEqual(settings[.PRODUCT_NAME], "CFooTests") - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.TARGET_NAME], "CFooTests") XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString) XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .iOS).versionString) @@ -952,8 +930,6 @@ class PIFBuilderTests: XCTestCase { XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests") XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests") XCTAssertEqual(settings[.PRODUCT_NAME], "CFooTests") - XCTAssertEqual(settings[.SWIFT_FORCE_DYNAMIC_LINK_STDLIB], "YES") - XCTAssertEqual(settings[.SWIFT_FORCE_STATIC_LINK_STDLIB], "NO") XCTAssertEqual(settings[.TARGET_NAME], "CFooTests") XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .watchOS).versionString) XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], MinimumDeploymentTarget.computeXCTestMinimumDeploymentTarget(for: .iOS).versionString)