summary refs log tree commit diff
path: root/pkgs/build-support/cc-wrapper
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-04-14 12:01:28 +0000
committerGitHub <noreply@github.com>2023-04-14 12:01:28 +0000
commite3d9654fec2011d3d5193e01980ac16973920642 (patch)
tree4763a5581c68ac11db2ada075e8c230e022f00e4 /pkgs/build-support/cc-wrapper
parent0092a9a75f565ca53e9bdd3c25d6eff5b944277b (diff)
parentbc74c8fb42f1c47e60a6d1be08b22cf0e2e1502a (diff)
downloadnixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.tar
nixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.tar.gz
nixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.tar.bz2
nixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.tar.lz
nixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.tar.xz
nixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.tar.zst
nixpkgs-e3d9654fec2011d3d5193e01980ac16973920642.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix7
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 1f1d7489a98..19a5afee1fb 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;
   };