Skip to content

Remove use of SWIFT_FORCE_* build settings #7464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Remove use of SWIFT_FORCE_* build settings #7464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Sources/XCBuildSupport/PIF.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Sources/XCBuildSupport/PIFBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
24 changes: 0 additions & 24 deletions Tests/XCBuildSupportTests/PIFBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand All @@ -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"])
Expand Down Expand Up @@ -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"])
}
Expand All @@ -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"])
}
Expand Down Expand Up @@ -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"])
Expand All @@ -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"])
Expand Down Expand Up @@ -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"])
}
Expand All @@ -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"])
}
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down