Skip to content

Don't try to build compiler-rt when cross-compiling #1759

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.

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 4 commits into from
Mar 21, 2016

Conversation

vedantk
Copy link
Contributor

@vedantk vedantk commented Mar 21, 2016

What's in this pull request?

This PR makes build-script skip building compiler-rt when cross-compiling.

A user has reported a build-time failure when building swift-compiler-rt along with --cross-compile-tools-deployment-targets set. We should have a workaround in place before investigating a longer-term fix.

Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
OS X platform @swift-ci Please test OS X platform
Linux platform @swift-ci Please test Linux platform

Note: Only members of the Apple organization can trigger swift-ci.

@vedantk
Copy link
Contributor Author

vedantk commented Mar 21, 2016

@llvm-beanz Could you take a look?

@llvm-beanz
Copy link
Contributor

The option you want to be turning Off is LLVM_TOOL_COMPILER_RT_BUILD. LLVM_BUILD_EXTERNAL_COMPILER_RT is just what controls whether or not you use an in-tree built clang.

@vedantk
Copy link
Contributor Author

vedantk commented Mar 21, 2016

Updated. I think the bugfix to false_true should be its own commit. Is it ok apart from that?

@llvm-beanz
Copy link
Contributor

LGTM.

vedantk added a commit that referenced this pull request Mar 21, 2016
Don't try to build compiler-rt when cross-compiling
@vedantk vedantk merged commit 5e342aa into swiftlang:master Mar 21, 2016
@vedantk vedantk deleted the cross-compile-compiler-rt branch January 31, 2018 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants