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

stdenv/{native,nix}: add lib to cc-wrapper args

Browse Source
This commit is contained in:
Taeer Bar-Yam 2021-04-21 11:56:55 -04:00
parent bb9d0c3038
commit 0a8784d5db
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ in
name = "cc-native"; name = "cc-native";
nativeTools = true; nativeTools = true;
nativeLibc = true; nativeLibc = true;
inherit nativePrefix; inherit lib nativePrefix;
bintools = import ../../build-support/bintools-wrapper { bintools = import ../../build-support/bintools-wrapper {
name = "bintools"; name = "bintools";
inherit stdenvNoCC nativePrefix; inherit stdenvNoCC nativePrefix;

1
pkgs/stdenv/nix/default.nix
View File

@ -24,6 +24,7 @@ bootStages ++ [
initialPath = (import ../common-path.nix) { pkgs = prevStage; }; initialPath = (import ../common-path.nix) { pkgs = prevStage; };
cc = import ../../build-support/cc-wrapper { cc = import ../../build-support/cc-wrapper {
inherit lib;
nativeTools = false; nativeTools = false;
nativePrefix = lib.optionalString hostPlatform.isSunOS "/usr"; nativePrefix = lib.optionalString hostPlatform.isSunOS "/usr";
nativeLibc = true; nativeLibc = true;