Skip to content

[5.3] Fix cross-compile bootstrap #2917

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

Jump to bottom
Merged
merged 2 commits into from
Sep 10, 2020
Merged

[5.3] Fix cross-compile bootstrap #2917

merged 2 commits into from
Sep 10, 2020

Conversation

neonichu
Copy link
Contributor

@neonichu neonichu commented Sep 9, 2020 •
edited
Loading

5.3 cherry-pick of #2916 and #2918

@neonichu
Cross-compile flags should be in get_swiftpm_flags
4948122 
These flags were only passed for regular builds, but not for testing or
other actions.

rdar://problem/68542579

(cherry picked from commit f691b1e)
@neonichu neonichu requested a review from shahmishal September 9, 2020 18:28
@neonichu
Copy link
Contributor Author

neonichu commented Sep 9, 2020

@swift-ci please test

@shahmishal shahmishal mentioned this pull request Sep 9, 2020
Merged
abertelrud
abertelrud approved these changes Sep 9, 2020
View reviewed changes
Copy link
Contributor

@abertelrud abertelrud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change makes sense to me, but I don't know where we are in terms of being able to merge to the 5.3 branch right now.

@abertelrud abertelrud changed the title Use cross compile flags for testing as well [5.3] Use cross compile flags for testing as well Sep 9, 2020
@abertelrud
Copy link
Contributor

Adding "[5.3]" prefix to PR name to make it clear that this intended for release/5.3 branch.

@abertelrud
Copy link
Contributor

This will need release manager approval.

@neonichu
Enable testability if test discovery is enabled
57f9d0d 
This just makes XCBuild support match what we do in SwiftPM's own build
system here: https://github.com/apple/swift-package-manager/blob/master/Sources/XCBuildSupport/PIFBuilder.swift#L308

We should probably revisit this behaviour, because this seems like a
very confusing side effect on macOS where test discovery isn't even a
thing, but right now we just want to match what the builtin build system
does.
@neonichu
Copy link
Contributor Author

@swift-ci please test

@neonichu neonichu changed the title [5.3] Use cross compile flags for testing as well [5.3] Fix cross-compile bootstrap Sep 10, 2020
@shahmishal shahmishal merged commit 91bdc78 into swiftlang:release/5.3 Sep 10, 2020
@neonichu neonichu deleted the use-cross-compile-flags-for-testing-as-well-2 branch September 10, 2020 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tkremenek tkremenek tkremenek approved these changes

@abertelrud abertelrud abertelrud approved these changes

@shahmishal shahmishal Awaiting requested review from shahmishal

@aciidgh aciidgh Awaiting requested review from aciidgh

@friedbunny friedbunny Awaiting requested review from friedbunny friedbunny is a code owner

@rballard rballard Awaiting requested review from rballard rballard is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@neonichu @abertelrud @tkremenek @shahmishal