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

darwin-stdenv: Don't use nativeTools

Browse Source 
Now, we'll actually use the wrapped ld to link
This commit is contained in:
John Ericson 2017-08-31 12:37:48 -04:00
parent 095af3e63b
commit 3b6e7fe123
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/darwin/default.nix
View File

@ -79,15 +79,17 @@ in rec {
inherit shell; inherit shell;
inherit (last) stdenv; inherit (last) stdenv;
nativeTools = true; nativeTools = false;
nativePrefix = bootstrapTools;
nativeLibc = false; nativeLibc = false;
buildPackages = lib.optionalAttrs (last ? stdenv) { buildPackages = lib.optionalAttrs (last ? stdenv) {
inherit (last) stdenv; inherit (last) stdenv;
}; };
libc = last.pkgs.darwin.Libsystem; libc = last.pkgs.darwin.Libsystem;
isClang = true; isClang = true;
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; };
coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; };
gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; };
}; };
preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''