treewide: Clean up multi-arch tools and usage #33087
Merged
Conversation
This file contains 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
Clang stdenvs with either libc++ should work now.
Ericson2314
force-pushed
the
alt-stdenv
branch
2 times, most recently
from
aa7690f
to
b6afa3f
Compare
|
@nixborg build |
|
Jobset created at https://hydra.mayflower.de/jobset/nixos/pr-33087 |
Ericson2314
changed the title
LnL7
approved these changes
Dec 27, 2017
pkgs/top-level/all-packages.nix
Outdated
| # Include unwrapped binaries like AS, etc. and remove libcxx/libcxxabi | ||
| extraBuildInputs = [ stdenv.cc.cc ]; | ||
| # Remove libcxx/libcxxabi | ||
| extraBuildInputs = [ ]; |
There was a problem hiding this comment.
This breaks tests.cc-wrapper-gcc on darwin, but there's probably a nicer way to fix it.
There was a problem hiding this comment.
I did the same method, but made it darwin-specific and specifically clang.
- Dispatch off more appropriate conditions---`stdenv.cc.is*` and `hostPlatform.is*` directly---rather than the OS as a proxy. - Don't worry about pulling in binutils from normal `stdenv.cc` for `gccMultiStdenv`. - Defining a `multiStdenv` that uses whatever compiler is default. - Define `stdenv_32bit` in terms of `multiStdenv`.
- Don't needlessly force GCC - Prefer using multi-arch stdenvs to using multi-arch tools directly.
Ericson2314
force-pushed
the
alt-stdenv
branch
from
b6afa3f
to
558c96f
Compare
Ericson2314
added this to Needed by the big PR---nice to move pick off pieces of it and move here, rebasing the big PR on top
in Cross compilation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 the commit messages for more details, but the principles basically are:
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)