diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-25 18:01:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 18:01:48 +0000 |
| commit | efe19ddf3b262e5d7b626c4cad6d690c110fb6a3 (patch) | |
| tree | 9eaf405056964d965821d0e37a4bcc06456c2f38 /pkgs/build-support | |
| parent | 187be07f46ed2c129f074631971d1586d4acb371 (diff) | |
| parent | 0b8aa77df10e1750f7f91fe4bdfa24685792c964 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/rust/lib/default.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 797a735f5a6ee..14cd1d4313916 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -489,6 +489,8 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" format" '' + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + optionalString targetPlatform.isMicroBlaze '' + hardening_unsupported_flags+=" stackprotector" '' + optionalString (libc != null && targetPlatform.isAvr) '' diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 34aaa8c516a99..2be0c25678798 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -5,6 +5,8 @@ rec { toTargetArch = platform: /**/ if platform ? rustc.platform then platform.rustc.platform.arch else if platform.isAarch32 then "arm" + else if platform.isMips64 then "mips64" # never add "el" suffix + else if platform.isPower64 then "powerpc64" # never add "le" suffix else platform.parsed.cpu.name; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os |