mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 14:11:21 +00:00
stdenv: fix evaluation if !stdenv.cc.hasCC
stdenv.cc may throw, e.g. in the case of pkgsCross.ghcjs where we must
not force it for the purpose of attribute accessing (`or` doesn't
implicitly tryEval…).
Regression introduced in 1a5bd697ad
.
This commit is contained in:
parent
3d673c9b54
commit
f734056102
@ -250,9 +250,10 @@ let
|
||||
"stackprotector"
|
||||
"strictoverflow"
|
||||
];
|
||||
defaultHardeningFlags = stdenv.cc.defaultHardeningFlags or
|
||||
# fallback safe-ish set of flags
|
||||
(remove "pie" knownHardeningFlags);
|
||||
defaultHardeningFlags =
|
||||
(if stdenv.hasCC then stdenv.cc else {}).defaultHardeningFlags or
|
||||
# fallback safe-ish set of flags
|
||||
(remove "pie" knownHardeningFlags);
|
||||
enabledHardeningOptions =
|
||||
if builtins.elem "all" hardeningDisable'
|
||||
then []
|
||||
|
Loading…
Reference in New Issue
Block a user