summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2022-07-20 16:38:08 +0800
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-08-08 17:50:26 +0000
commitb323542ca702adf30c44345873c3fac3e9e2702d (patch)
tree5b743caaa1cf6ae280d87a85b5760c4bf406fa48
parentnixos/snipe-it: Add private_uploads to tmpfiles (diff)
downloadnixpkgs-b323542ca702adf30c44345873c3fac3e9e2702d.tar.gz
cc-wrapper: Set correct hardening_unsupported_flags for newlib-nano
(cherry picked from commit d5fb429c7dcaaabde24d4efb8d96c97ecb356a63)
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index ac6257220fd1..ffa5468195a1 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -481,7 +481,7 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic"
- '' + optionalString (targetPlatform.libc == "newlib") ''
+ '' + optionalString (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
'' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) ''
hardening_unsupported_flags+=" stackprotector"