diff options
| author | Walter Franzini <walter.franzini@gmail.com> | 2019-06-08 00:40:28 +0200 |
|---|---|---|
| committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2021-02-12 21:11:16 +0100 |
| commit | eabb56ac6c2458796714be527a790ca23de66f38 (patch) | |
| tree | f1666972a17df6187555f1d11dea3cb085d25748 | |
| parent | 42e689e5bddb852801bd1fd8acb11ceab758f67c (diff) | |
identify musl32 using x86_32 instead of i686
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libsodium/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 3939b3efb6476..c8af8789fccf3 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -451,9 +451,9 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector pic" '' + optionalString (targetPlatform.libc == "newlib") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" - '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isi686) '' + '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) '' hardening_unsupported_flags+=" stackprotector" - '' + optionalString targetPlatform.isNetBSD '' + '' + optionalString targetPlatform.isNetBSD '' hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString cc.langAda or false '' hardening_unsupported_flags+=" format stackprotector strictoverflow" diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e7f60aa4fc5d1..64ae1713fd451 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; - hardeningDisable = stdenv.lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isi686) "stackprotector"; + hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; # FIXME: the hardeingDisable attr above does not seems effective, so # the need to disable stackprotector via configureFlags - configureFlags = stdenv.lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isi686) "--disable-ssp"; + configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; doCheck = true; |