about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-28 12:29:02 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-02-26 15:55:47 -0500
commitaab8c7ba437d240bd9780e09489e7358fee180e2 (patch)
treeaa9f728c9750b5b86effef7830bf4a575fa53c16 /pkgs/build-support
parent1b2675213cd3e59a0a71a60529cc110ac80dd4a3 (diff)
downloadnixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.tar
nixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.tar.gz
nixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.tar.bz2
nixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.tar.lz
nixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.tar.xz
nixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.tar.zst
nixlib-aab8c7ba437d240bd9780e09489e7358fee180e2.zip
netbsd: add cross target
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/bintools-wrapper/default.nix1
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix4
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 142f5255caad..7ec74a2a92af 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -53,6 +53,7 @@ let
     /**/ if libc == null then null
     else if targetPlatform.libc == "musl"             then "${libc_lib}/lib/ld-musl-*"
     else if targetPlatform.libc == "bionic"           then "/system/bin/linker"
+    else if targetPlatform.libc == "nblibc"           then "${libc_lib}/libexec/ld.elf_so"
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 176df51cbd9a..f05b9fb22555 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -291,6 +291,10 @@ stdenv.mkDerivation {
       hardening_unsupported_flags+=" stackprotector pic"
     ''
 
+    + optionalString targetPlatform.isNetBSD ''
+      hardening_unsupported_flags+=" stackprotector fortify"
+    ''
+
     + optionalString (targetPlatform.libc == "newlib") ''
       hardening_unsupported_flags+=" stackprotector fortify pie pic"
     ''