treewide: Some LLVM / bootstrapping / cross cleanups especially for consistency#122655
Merged
Ericson2314 merged 7 commits intoNixOS:stagingfrom May 12, 2021
Merged
Conversation
* Use LLVM_PATH instead of llvm-config * Pass less unnecessary options to cmake
This keeps the "main bootstrap" together.
This decision was made in a902d99 but just for LLVM 12. Now we apply it consitently.
- Introduce `preLibcCrossHeaders` to bootstrap libgcc and compiler-rt
the same way.
- Organize LLVM bintools as `bintools{-unwrapped,,NoLibc}` for
consistency with GNU Binutils and Apple's cctools.
- Do Android changes for all `llvmPackages` for consistency.
- Improve the way the default GCC and LLVM versions are selected.
The main thing was using `llvm_meta` in all versions.
Secondarily:
- libunwindx7: Forgot to split outputs
- libcxx{,abi} 12: Forgot to apply output-splitting patches.
- simplify `useLLVM` stdenv-switching logic.
- openmp always gets its own directory
fbcc853 to
e830db4
Compare
Member
Author
|
I'm going to merge this as it's should be all churn no risk, and I am nervous about making the cut-off. |
10 tasks
12 tasks
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
2 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
See each commit. There is a lot of diff here but most of it is skin deep.
The things that escaped #111487 I am doing sound higher risk but aren't, because they are for bits of LLVM we don't use too much (unwind 7, LLVM 12 libc++, etc.).
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)depends on #120790
CC @NixOS/exotic-platform-maintainers