summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-11-03 04:15:23 -0500
committerGitHub <noreply@github.com>2019-11-03 04:15:23 -0500
commitb2372b8d5efb6954edb18d4698a5106ff26c4c66 (patch)
tree09eac3b5757bf48be3d62d3c1adcc8fa56a6c568 /pkgs/os-specific
parenta5e7b47f3dfab961aa63468d27290e3226da191e (diff)
parent8e912bcb30c2625b72b71b2d096195868d1bcc43 (diff)
downloadnixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.tar
nixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.tar.gz
nixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.tar.bz2
nixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.tar.lz
nixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.tar.xz
nixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.tar.zst
nixpkgs-b2372b8d5efb6954edb18d4698a5106ff26c4c66.zip
Merge pull request #72639 from kirelagin/netbsd-musl
Tweak cross-compilation of some netbsd stuff
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/bsd/netbsd/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index f724fd33939..2d51c11f04a 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -127,6 +127,11 @@ let
     nativeBuildInputs = [ makeMinimal ];
     buildInputs = [ zlib ];
 
+    # the build system re-runs `./configure` with `HOST_CC` (which is their
+    # name for Build CC) as a compiler to make `defs.mk`, which is installed
+    depsBuildBuild = [ buildPackages.stdenv.cc ] ++ buildInputs;
+    HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc";
+
     # temporarily use gnuinstall for bootstrapping
     # bsdinstall will be built later
     makeFlags = [
@@ -218,9 +223,9 @@ let
     ];
     skipIncludesPhase = true;
     buildPhase = ''
-      cc  -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
+      "$CC" -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
           -o lib/libc/gen/fts.o
-      ar -rsc libfts.a lib/libc/gen/fts.o
+      "$AR" -rsc libfts.a lib/libc/gen/fts.o
     '';
     installPhase = ''
       runHook preInstall