diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-30 18:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 18:01:31 +0000 |
| commit | 15686bdd946efce1e74d0405412889b2b86e227d (patch) | |
| tree | 61ef043b1467c8cbb87fee593f963ecfaf73d4e3 /pkgs/stdenv | |
| parent | 5ebd4b10df1710272cdec4551326bcbf3459490d (diff) | |
| parent | 6e5cce711d76c4c5b4a2bc99cc338fd32d8c668d (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 871aed59e35e5..73030e7d941e8 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -178,7 +178,7 @@ let # Except when: # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. # - static armv7l, where compilation fails. - !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic) + !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic) then supportedHardeningFlags else lib.remove "pie" supportedHardeningFlags; enabledHardeningOptions = |