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

cc-wrapper: don't set env to null when nativeTools is used

Browse Source 
This is not allowed and fails fatal
This commit is contained in:
Sandro Jäckel 2023-02-18 19:44:44 +01:00
parent b0ee79f9fd
commit a7dbdb7644
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/cc-wrapper/default.nix
View File

@ -550,8 +550,11 @@ stdenv.mkDerivation {
expandResponseParams = "${expand-response-params}/bin/expand-response-params";
shell = getBin shell + shell.shellPath or "";
gnugrep_bin = if nativeTools then "" else gnugrep;
# stdenv.cc.cc should not be null and we have nothing better for now.
# if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
cc = if nativeTools then "" else cc;
wrapperName = "CC_WRAPPER";
inherit suffixSalt coreutils_bin bintools cc;
inherit suffixSalt coreutils_bin bintools;
inherit libc_bin libc_dev libc_lib;
inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
};