diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-03 14:01:28 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-03 14:01:28 +0100 |
| commit | 9d59d57d4504655a2b71a5fcf769978492525a43 (patch) | |
| tree | 3b1486684a22cff0003bd6edaf9ecff42413634f /pkgs/os-specific | |
| parent | b4270a7e798940213362a368ae9e1da27adcfb88 (diff) | |
| parent | 6ae60c48b09da20c73788df436a4aaaef49b51ae (diff) | |
| download | nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.tar nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.tar.gz nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.tar.bz2 nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.tar.lz nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.tar.xz nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.tar.zst nixlib-9d59d57d4504655a2b71a5fcf769978492525a43.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 9 |
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 f724fd33939e..2d51c11f04a6 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 |