public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stdenv-native by creating a bintools wrapper with similar settings

Browse Source
This commit is contained in:
Sander van der Burg 2018-04-14 14:05:09 +02:00
parent 72b27f2519
commit 5a545ca9bd
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/stdenv/native/default.nix
View File

@ -119,14 +119,23 @@ in
}; };
stdenvNoCC = stdenv; stdenvNoCC = stdenv;
cc = import ../../build-support/cc-wrapper { cc = let
name = "cc-native";
nativeTools = true;
nativeLibc = true;
nativePrefix = { # switch nativePrefix = { # switch
"i686-solaris" = "/usr/gnu"; "i686-solaris" = "/usr/gnu";
"x86_64-solaris" = "/opt/local/gcc47"; "x86_64-solaris" = "/opt/local/gcc47";
}.${system} or "/usr"; }.${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; inherit stdenvNoCC;
}; };