llvmPackages_{10,11}.compiler-rt: restrict build to current arch#116833
Merged
Ericson2314 merged 2 commits intoNixOS:masterfrom Mar 19, 2021
Merged
llvmPackages_{10,11}.compiler-rt: restrict build to current arch#116833Ericson2314 merged 2 commits intoNixOS:masterfrom
Ericson2314 merged 2 commits intoNixOS:masterfrom
Conversation
ofborg
bot
added
10.rebuild-darwin: 11-100
Member
|
I like this change. If we ever want to support multi-arch stuff, I would make cc-wrapper more clever by e.g. only adding an |
Ericson2314
approved these changes
Mar 19, 2021
Contributor
|
#115435 is merged now, should this target some other branch now? |
Contributor
|
/rebase master |
Workaround for build failure after adding mandatory -arch argument. Nixpkgs targets a single architecture, so this saves a small amount of wasted build effort. See NixOS#114817 (comment)
Contributor
|
Rebased, please reopen the pull request to restart CI |
rrbutani
added
the
6.topic: llvm/clang
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Motivation for this change
Fix
llvmPackages_10.compiler-rtandllvmPackages_11.compiler-rtonstaging-next.These packages were broken by #114817 (see #114817 (comment)).
While I'm here, use
darwinArchfor all compiler-rts, which is a no-op onx86_64-darwin.I assert this change is correct in that nixpkgs only targets a single architecture at once, so building for extra platforms is unnecessary work. The alternative is to remove the
-archargument from the cc/bintools wrappers (revert fc0456b, b26e0ba and 8feb949).Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)