diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-08 18:02:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 18:02:11 +0000 |
| commit | 67f5b5a85dbb2e134af310e4cf2e9296132f15d5 (patch) | |
| tree | 5692a1f6fe0a070d6c03d7bfbc4891ccf7e08a7a /pkgs/build-support | |
| parent | d5aaf15094e607fa87d04486d41db4e771c200fb (diff) | |
| parent | d7cee51c43b898b2d28551f087e1646efbf0e173 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
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 ad8104246aa9f..b9dc9fc9a7232 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -482,7 +482,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" |