mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues 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

6
pkgs/stdenv/darwin/default.nix
View file

@ -79,8 +79,7 @@ in rec {
inherit shell;
inherit (last) stdenv;
nativeTools = true;
nativePrefix = bootstrapTools;
nativeTools = false;
nativeLibc = false;
buildPackages = lib.optionalAttrs (last ? stdenv) {
inherit (last) stdenv;
@ -88,6 +87,9 @@ in rec {
libc = last.pkgs.darwin.Libsystem;
isClang = true;
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") ''