From nobody Fri Aug 22 20:46:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7sfx3x1sz64wDd; Fri, 22 Aug 2025 20:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7sfx2Swvz3D6g; Fri, 22 Aug 2025 20:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJZiI7DHBE0EYEvb6vlWSFttGYTteShQWd4cYlA/2pA=; b=hI3pZDs9BPUUvWHBEI+7RQxQGWNGU848OL4lDIeLKjike1CEFsDqan5iIogqr8eRAec7Kt 4NxC64bvqJUag1RJ/IbA48H2DDfOrAjSWP7Rz8VS4nHDhSUZM0262IBa2InLl7dYwGtx+0 QQVfmwx9DFqGx3Ev5GZfm/0D7BfN5s8lYO2F9bv+uftsPBB5OMcUx1KSlUc5/07/U+4id5 qcxyBmQQDIFd8uBXcfxfjsRia5jFMvs6GDrqWH2Gfql4gJBDF9tgz/k3qpQ1oJWSJwK69o 5MioZ4W9/FdMv/bIb+EKqAXw5DDowpv0L++4STEptKQGLfRbMVCK2s4HXFqzUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJZiI7DHBE0EYEvb6vlWSFttGYTteShQWd4cYlA/2pA=; b=sJk1COfcD7Gf7qBojvSs+Cpuqiah+1+UdiZOhGOAI2Gy26FYKqLtWHa5a1bMmNXZFigm+3 IeSsC86ZHnmMTBC7tOZHoNTq622O4n9X4wWemhzBkD5+qTnJSx/T7paA0hU7HGGnlB8l6L +XpT0DXnh0ZNDufH5lf/+jq92fodxVsZh2+LnNz45Zkomlr5BhHG0yhgSNZsYnbOTnZtkq y9I8bs1vBdt+L+5esB+SAWeRmzAR2FUbemJjVeYcHtimpnARl/Trkb1w0Hb9KYOVyUzx5r gT98GVrQaQNwHbFf0JwQFrZAy2SmYuF7/dUIbMclfBxfqORa7yhTUdo8rxuszw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895593; a=rsa-sha256; cv=none; b=ayRvsFrij+2qClYvSO57BlhzS1z5iUBr892zWV6Zqp8hwaYbASD1swv+6X+M/awUP/jVTY KHMVb4mrGjbT/7qyWZmjaWDK7o+j2b6JO7nujgr3BgVHnb1PZxskDM0a8dJXnLoJrKEKp7 eU3fknANnejA/LHivopxUVbQveHPtYh2ww0FUL1DYInFxcSsARmjSpNu5oa2C5IkTojceb B8yscXMMCIfmPZVaXdTOGdqcwABoMCRK64rR9y+why/Ez8+DencN4DAzGlyOI0Bpt3utbk pDdbIV0LsxbuYxU/HKBIzr7TOMOkxGdm1Vg5OSsAIrrUNp6ZBRXZgs+GPSP8vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7sfx1mNYz129G; Fri, 22 Aug 2025 20:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57MKkXKD008795; Fri, 22 Aug 2025 20:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKkX24008792; Fri, 22 Aug 2025 20:46:33 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:46:33 GMT Message-Id: <202508222046.57MKkX24008792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ad13dc1ece2f - main - bsd.compat.mk: Honour XSTRIPBIN for lib32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2 commit ad13dc1ece2fe4a6192bceffea4a868ba6a2e0e2 Author: Jessica Clarke AuthorDate: 2025-08-22 20:46:16 +0000 Commit: Jessica Clarke CommitDate: 2025-08-22 20:46:16 +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 --- 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 6fa732fd730b..bad68d1ebd8e 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -74,6 +74,7 @@ LIB32WMAKEFLAGS= \ LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" +LIB32WMAKEFLAGS+= STRIPBIN="${XSTRIPBIN}" LIB32DTRACE= ${DTRACE} -32 LIB32_MACHINE_ABI= ${MACHINE_ABI:N*64} long32 ptr32