diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2018-04-14 14:05:09 +0200 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2018-04-14 14:05:09 +0200 |
| commit | 5a545ca9bdf59c18b123d2a99dccdd1a173a749d (patch) | |
| tree | 969341babe3ba455b946cb77674c65831c2854ea /pkgs/stdenv/native | |
| parent | 72b27f2519ff8fcd5c7b45c00580049c618a1eb5 (diff) | |
| download | nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.tar nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.tar.gz nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.tar.bz2 nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.tar.lz nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.tar.xz nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.tar.zst nixpkgs-5a545ca9bdf59c18b123d2a99dccdd1a173a749d.zip | |
Fix stdenv-native by creating a bintools wrapper with similar settings
Diffstat (limited to 'pkgs/stdenv/native')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 19efac3700a..78f7a82d295 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -119,14 +119,23 @@ in }; stdenvNoCC = stdenv; - cc = import ../../build-support/cc-wrapper { - name = "cc-native"; - nativeTools = true; - nativeLibc = true; + cc = let nativePrefix = { # switch "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; + in + import ../../build-support/cc-wrapper { + name = "cc-native"; + nativeTools = true; + nativeLibc = true; + inherit nativePrefix; + bintools = import ../../build-support/bintools-wrapper { + name = "bintools"; + inherit stdenvNoCC nativePrefix; + nativeTools = true; + nativeLibc = true; + }; inherit stdenvNoCC; }; |