The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3300572ffcc679457995c8ec4d9eb354cf12defc
commit 3300572ffcc679457995c8ec4d9eb354cf12defc Author: Jessica Clarke <[email protected]> AuthorDate: 2025-08-22 20:46:16 +0000 Commit: Jessica Clarke <[email protected]> CommitDate: 2025-12-15 16:58:45 +0000 bsd.compat.mk: Honour XSTRIPBIN for lib32 Currently we only honour XNM and XOBJCOPY, but XSTRIPBIN is important during install. Otherwise we end up using STRIPBIN for the host, not the target, which is normally the same, but may not be, especially on non-FreeBSD systems. In particular, cheribuild will build FreeBSD with STRIPBIN=/usr/bin/strip XSTRIPBIN=strip (with the latter referring to the bootstrap strip in PATH), which breaks for WITH_LIB32 when the host's /usr/bin/strip is unable to process the lib32 binaries (e.g. building arm64 FreeBSD's lib32 on an amd64 GNU/Linux system). MFC after: 1 week (cherry picked from commit ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2) --- share/mk/bsd.compat.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 0c387bcb020c..f53b1e78a478 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -85,6 +85,7 @@ LIB32WMAKEFLAGS= \ LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" +LIB32WMAKEFLAGS+= STRIPBIN="${XSTRIPBIN}" LIB32DTRACE= ${DTRACE} -32 LIB32_MACHINE_ABI= ${MACHINE_ABI:N*64} long32 ptr32
