diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-28 10:00:10 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-28 10:41:19 -0500 |
| commit | 9fd1c170cc10fbd2bbc4eb37c8b4f35e383c3731 (patch) | |
| tree | 7e5f7a2e2cd9b98487e1b4b19b7597cacd0cab70 /pkgs | |
| parent | e20b65156cee92d30b43f8e339bd686bd83538cb (diff) | |
make-derivation: try to fix stdenv.cc == null conditional
sometimes this gets an infinite recursion error
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 90dbb102fae9..f9792aaf01f4 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -94,7 +94,7 @@ rec { ++ depsHostHost ++ depsHostHostPropagated ++ buildInputs ++ propagatedBuildInputs ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; - dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || stdenv.cc == null; + dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false); supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; defaultHardeningFlags = if stdenv.hostPlatform.isMusl then supportedHardeningFlags diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5477c91251b2..eae1a744f1d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33,7 +33,7 @@ in # just the plain stdenv. stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); - stdenvNoCC = stdenv.override { cc = null; }; + stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; }; stdenvNoLibs = let bintools = stdenv.cc.bintools.override { |