diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-30 17:46:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-30 17:46:21 +0100 |
| commit | 1828a5c5ba465b7f342568c6a245a042831ef54c (patch) | |
| tree | 3052eb1b293c7655d9ea58d78aa81d0bf2c1d539 /pkgs/stdenv | |
| parent | 70f5d64cb359a8e4351a32f24d68b8a8e0227b76 (diff) | |
| parent | 74e283403c9f10504c1d2ab8c4970289c81a482b (diff) | |
| download | nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.tar nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.gz nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.bz2 nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.lz nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.xz nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.zst nixpkgs-1828a5c5ba465b7f342568c6a245a042831ef54c.zip | |
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 1829531e895..ec51b5415c1 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -104,7 +104,7 @@ rec { ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; - defaultHardeningFlags = if stdenv.targetPlatform.isMusl + defaultHardeningFlags = if stdenv.hostPlatform.isMusl then supportedHardeningFlags else lib.remove "pie" supportedHardeningFlags; enabledHardeningOptions = |