Date: Mon, 15 Dec 2025 18:19:04 +0000 From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 29e74434e4d0 - stable/13 - bsd.compat.mk: Honour XSTRIPBIN for lib32 Message-ID: <69405118.2575d.4c2bdacc@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 commit 29e74434e4d0c9b11ef5cbf5c7bafa32bfcddfc5 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2025-08-22 20:46:16 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2025-12-15 17:56:37 +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 ef485b843f99..de25b6e941c3 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -87,6 +87,7 @@ LIB32LDFLAGS= -Wl,-m${_EMULATION} LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" +LIB32WMAKEFLAGS+= STRIPBIN="${XSTRIPBIN}" LIB32CFLAGS= -DCOMPAT_32BIT LIB32DTRACE= ${DTRACE} -32help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69405118.2575d.4c2bdacc>