diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
| commit | c5881ec2c91da7bcb4b0299f5842019c70cb90f5 (patch) | |
| tree | 9efaa7fe9f326a04e98760f5b3f10f6f463905ce /pkgs/stdenv/generic/make-derivation.nix | |
| parent | e6834171b930f6db3796a16785d7cbb3173541b1 (diff) | |
| parent | 095544187a8ed13f14356f5df7dbe0ecc059ceb5 (diff) | |
| download | nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.gz nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.bz2 nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.lz nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.xz nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.zst nixpkgs-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/stdenv/generic/make-derivation.nix')
| -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 fa0d4ea405e..f3c4afb613e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -98,7 +98,7 @@ rec { ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || stdenv.cc == null; 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 = |