Merge pull request #72639 from kirelagin/netbsd-musl

Tweak cross-compilation of some netbsd stuff
This commit is contained in:
John Ericson 2019-11-03 04:15:23 -05:00 committed by GitHub
commit b2372b8d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -127,6 +127,11 @@ let
nativeBuildInputs = [ makeMinimal ]; nativeBuildInputs = [ makeMinimal ];
buildInputs = [ zlib ]; 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 # temporarily use gnuinstall for bootstrapping
# bsdinstall will be built later # bsdinstall will be built later
makeFlags = [ makeFlags = [
@ -218,9 +223,9 @@ let
]; ];
skipIncludesPhase = true; skipIncludesPhase = true;
buildPhase = '' 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 -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 = '' installPhase = ''
runHook preInstall runHook preInstall