From a7dbdb7644ec27782b35a8dc07e3b0070c5232ed Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sat, 18 Feb 2023 19:44:44 +0100 Subject: cc-wrapper: don't set env to null when nativeTools is used This is not allowed and fails fatal --- pkgs/build-support/cc-wrapper/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/build-support/cc-wrapper/default.nix') diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6520c04f5e8..c614fe0d287 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -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; }; -- cgit 1.4.1