make-derivation: try to fix stdenv.cc == null conditional
sometimes this gets an infinite recursion error
This commit is contained in:
parent
e20b65156c
commit
9fd1c170cc
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue