b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #120080 from Radvendii/cc-wrapper-lib

Browse source 
stdenv/{native,nix}: add lib to cc-wrapper args
This commit is contained in:
John Ericson 2021-04-22 01:05:22 -04:00 committed by GitHub
parent 43c27a4f44 0a8784d5db
commit fce51c8457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;