diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-04-14 11:22:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-14 11:22:20 +0200 |
commit | b04d4bad2783416c587c45528ccc763c7910ff07 (patch) | |
tree | 1c471a07f535d6a1e67a1d7115a15c6b1e69e68e /pkgs/build-support/cc-wrapper | |
parent | 6ed78f017cd0bdc4cb21ffaf77d15a471cf546dc (diff) | |
parent | 7090651071c9fb91da728183374d515f0894e37c (diff) |
Merge pull request #216992 from SuperSandro2000/stdenvNative-fix-eval
{bintools,cc}-wrapper: don't fallback to version = null
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 1f1d7489a988d..19a5afee1fb83 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -161,7 +161,7 @@ assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper"); - version = if cc == null then null else ccVersion; + version = if cc == null then "" else ccVersion; preferLocalBuild = true; @@ -598,8 +598,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; }; |