[SR-14896] swift build --build-system xcode doesn't respect SWIFT_EXEC
#3596
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -133,20 +131,28 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { | |||
| supportedArchitectures: [], | |||
There was a problem hiding this comment.
While you're in this area, can targetArchitecture also be updated to the host architecture (x86_64 or arm64) instead of hardcoded, if it's readily available?
There was a problem hiding this comment.
Absolutely — there's a whole range of fixes here, but I wanted to parcel them out across a couple of different PRs. This particular one would unblock some CI problems, as alluded to, but I plan to put up another PR that cleans up some of the other hardcoded things here. Also -toolchain and -sdk are not respected, for example.
There was a problem hiding this comment.
Put up as a separate PR here: #3597
|
I probably need to conditionalize this on macOS before running tests. Marking as WIP until then. |
abertelrud
force-pushed
the
eng/xcbuild-doesnt-respect-swift_exec
branch
from
8827104 to
88ec72b
Compare
|
@swift-ci please smoke test |
abertelrud
added
the
ready
…EXEC` When using the `xcode` build system, SwiftPM isn't passing down the result of overriding SWIFT_EXEC. The same is true for `-toolchain` and `-sdk` but this will be fixed in a different PR. Besides being incorrect and thus a generally something that should be fixed, this also affects SwiftPM CI, where the newly built compiler isn't being used when cross-compilation is active (since SwiftPM currently implements multi-architecture builds by switching build system to use xcbuild). rdar://80194565
abertelrud
force-pushed
the
eng/xcbuild-doesnt-respect-swift_exec
branch
from
88ec72b to
f953c9a
Compare
|
@swift-ci please smoke test |
tomerd
approved these changes
Jul 8, 2021
neonichu
approved these changes
Jul 8, 2021
abertelrud
added a commit
to abertelrud/swift-package-manager
that referenced
this pull request
Jul 9, 2021
…SWIFT_EXEC` (swiftlang#3596) When using the `xcode` build system, SwiftPM isn't passing down the result of overriding SWIFT_EXEC. The same is true for `-toolchain` and `-sdk` but this will be fixed in a different PR. Besides being incorrect and thus a generally something that should be fixed, this also affects SwiftPM CI, where the newly built compiler isn't being used when cross-compilation is active (since SwiftPM currently implements multi-architecture builds by switching build system to use xcbuild). This is the Swift 5.5 nomination of this fix. rdar://80194565 (cherry picked from commit 9aab44d)
abertelrud
added a commit
that referenced
this pull request
Jul 9, 2021
…SWIFT_EXEC` (#3596) (#3600) When using the `xcode` build system, SwiftPM isn't passing down the result of overriding SWIFT_EXEC. The same is true for `-toolchain` and `-sdk` but this will be fixed in a different PR. Besides being incorrect and thus a generally something that should be fixed, this also affects SwiftPM CI, where the newly built compiler isn't being used when cross-compilation is active (since SwiftPM currently implements multi-architecture builds by switching build system to use xcbuild). This is the Swift 5.5 nomination of this fix. rdar://80194565 (cherry picked from commit 9aab44d)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using the
xcodebuild system, SwiftPM isn't passing down the result of overriding SWIFT_EXEC. The same is true for-toolchainand-sdkbut this will be fixed in a different PR.Motivation:
Besides being incorrect and thus a generally something that should be fixed, this also affects SwiftPM CI, where the newly built compiler isn't being used when cross-compilation is active (since SwiftPM currently implements multi-architecture builds by switching build system to use xcbuild).
Modifications:
xcbuildso it matches what the native build system would have usedrdar://80194565