Skip to content

[build] Remove redundant block applying '-mcx16' flag again for Android x86_64 #35023

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 1 commit into from
Dec 21, 2020
Merged

[build] Remove redundant block applying '-mcx16' flag again for Android x86_64 #35023

merged 1 commit into from
Dec 21, 2020

Conversation

finagolfin
Copy link
Member

@finagolfin finagolfin commented Dec 9, 2020 •
edited
Loading

@rjmccall and @compnerd, this fixes a bug in #34958. I just noticed this because it was wrongly applying this flag when cross-compiling the stdlib for Android AArch64 too, and clang put out a bunch of warnings about it.

Fix has now been merged in another pull #35102, this is just the remaining cleanup.

@finagolfin
Copy link
Member Author

@drexin, would you run the CI on this?

@drexin
Copy link
Contributor

drexin commented Dec 11, 2020

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 7630e5a2180b1dcab13262f1dd65ad7fee0b8933

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 7630e5a2180b1dcab13262f1dd65ad7fee0b8933

@finagolfin
Copy link
Member Author

Linux CI failure is spurious, Mac failure is unrelated.

@drexin
Copy link
Contributor

drexin commented Dec 11, 2020

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 7630e5a2180b1dcab13262f1dd65ad7fee0b8933

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 7630e5a2180b1dcab13262f1dd65ad7fee0b8933

@finagolfin
Copy link
Member Author

finagolfin commented Dec 12, 2020 •
edited
Loading

Linux and Mac CI are both broken right now: all Linux builds are failing with a lldb template build error and all Mac runs put out an error about a "database is locked" when stress testing. Windows failure when building CMark is probably spurious.

@finagolfin
Copy link
Member Author

Ping, can someone run the CI again?

@finagolfin finagolfin mentioned this pull request Dec 18, 2020
Merged
@finagolfin finagolfin changed the title [build] Don't apply '-mcx16' to cross-compiled stdlibs based on the host arch [build] Remove redundant block applying '-mcx16' flag again for Android x86_64 Dec 18, 2020
@benlangmuir
Copy link
Contributor

@swift-ci please smoke test

@benlangmuir
Copy link
Contributor

@swift-ci please smoke test Linux

2 similar comments
@benlangmuir
Copy link
Contributor

@swift-ci please smoke test Linux

@benlangmuir
Copy link
Contributor

@swift-ci please smoke test Linux

@benlangmuir benlangmuir merged commit 9d89153 into swiftlang:main Dec 21, 2020
@finagolfin finagolfin deleted the flag-fix branch December 22, 2020 03:57
@finagolfin finagolfin mentioned this pull request Dec 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@finagolfin @drexin @swift-ci @benlangmuir @compnerd