diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-26 00:06:11 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:52:28 -0400 |
| commit | 594d26420594acf458e5a8ab75229a2147d9194f (patch) | |
| tree | 9211ca90764bdb1810aa4c2a5fb0e5fd51f78a76 /pkgs/top-level | |
| parent | 9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764 (diff) | |
| download | nixlib-594d26420594acf458e5a8ab75229a2147d9194f.tar nixlib-594d26420594acf458e5a8ab75229a2147d9194f.tar.gz nixlib-594d26420594acf458e5a8ab75229a2147d9194f.tar.bz2 nixlib-594d26420594acf458e5a8ab75229a2147d9194f.tar.lz nixlib-594d26420594acf458e5a8ab75229a2147d9194f.tar.xz nixlib-594d26420594acf458e5a8ab75229a2147d9194f.tar.zst nixlib-594d26420594acf458e5a8ab75229a2147d9194f.zip | |
cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request any subset to be passed as needed. See docs for more info. rustc: Avoid hash breakage by using the old (ignored) dontSetConfigureCross when not cross building
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b499b623a8c2..c201715dfef3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7802,10 +7802,11 @@ with pkgs; installLocales = config.glibc.locales or false; # Can't just overrideCC, because then the stdenv-cross mkDerivation will be # thrown away. TODO: find a better solution for this. - stdenv = buildPackages.makeStdenvCross - buildPackages.buildPackages.stdenv - buildPackages.targetPlatform - buildPackages.gccCrossStageStatic; + stdenv = buildPackages.makeStdenvCross { + inherit (buildPackages.buildPackages) stdenv; + inherit buildPlatform hostPlatform targetPlatform; + cc = buildPackages.gccCrossStageStatic; + }; }; # We can choose: |