Merge pull request #139046 from r-burns/nbcompat-take-two

[staging-next] netbsd.compat: fix libs by using cctools strip as objcopy
This commit is contained in:
Luke Granger-Brown 2021-09-23 02:14:37 +01:00 committed by GitHub
commit 759c4c9da1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -188,8 +188,6 @@ in lib.makeScopeWithSplicing
bsdSetupHook netbsdSetupHook bsdSetupHook netbsdSetupHook
makeMinimal makeMinimal
rsync rsync
] ++ lib.optionals stdenv.buildPlatform.isDarwin [
buildPackages.binutils
]; ];
buildInputs = with self; commonDeps; buildInputs = with self; commonDeps;
@ -204,9 +202,15 @@ in lib.makeScopeWithSplicing
"TSORT=cat" "TSORT=cat"
# Can't process man pages yet # Can't process man pages yet
"MKSHARE=no" "MKSHARE=no"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
# GNU objcopy produces broken .a libs which won't link into dependers.
# Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here.
"OBJCOPY=${buildPackages.darwin.cctools}/bin/strip"
]; ];
RENAME = "-D"; RENAME = "-D";
passthru.tests = { netbsd-install = self.install; };
patches = [ patches = [
./compat-cxx-safe-header.patch ./compat-cxx-safe-header.patch
./compat-dont-configure-twice.patch ./compat-dont-configure-twice.patch