Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 16 Apr 2026 14:25:46 +0000
From:      Roger Pau =?utf-8?Q?Monn=C3=A9?= <royger@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cb0504025c42 - main - bsd.port.mk: also export GNU strip when USE_BINUTILS is set
Message-ID:  <69e0f16a.467d6.1e2f5b84@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by royger:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cb0504025c42fac4b2d1f973651ed31cfea52f5f

commit cb0504025c42fac4b2d1f973651ed31cfea52f5f
Author:     Roger Pau Monné <royger@FreeBSD.org>
AuthorDate: 2026-02-25 14:10:20 +0000
Commit:     Roger Pau Monné <royger@FreeBSD.org>
CommitDate: 2026-04-16 14:06:18 +0000

    bsd.port.mk: also export GNU strip when USE_BINUTILS is set
    
    GNU Binutils packages strip, and should be used in preference to the base
    LLVM strip when USE_BINUTILS = yes.
    
    Do not take over the STRIP makefile variable, which is already used in
    bsd.port.mk to signal whether the install program should strip the
    binaries.  Instead define STRIP_CMD and use STRIP just for the environment
    variables.
    
    Reviewed by: dim arrowd
    Approved by: mat (portmgr)
    Sponsored by: Citrix Systems R&D
    Differential revision: https://reviews.freebsd.org/D55509
---
 Mk/bsd.port.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 249b7ce7e40e..4c10b7fff842 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1856,15 +1856,15 @@ USE_BINUTILS=	yes
 .    if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 BINUTILS?=	ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \
-	READELF SIZE STRINGS
+	READELF SIZE STRINGS STRIP_CMD
 BINUTILS_NO_MAKE_ENV?=
 .      for b in ${BINUTILS}
-${b}=	${LOCALBASE}/bin/${b:C/PP/++/:tl}
+${b}=	${LOCALBASE}/bin/${b:C/PP/++/:C/_CMD//:tl}
 .        if defined(GNU_CONFIGURE) || defined(BINUTILS_CONFIGURE)
-CONFIGURE_ENV+=	${b}="${${b}}"
+CONFIGURE_ENV+=	${b:C/_CMD//}="${${b}}"
 .        endif
 .        if ${BINUTILS_NO_MAKE_ENV:M${b}} == ""
-MAKE_ENV+=	${b}="${${b}}"
+MAKE_ENV+=	${b:C/_CMD//}="${${b}}"
 .        endif
 .      endfor
 .    endif
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e0f16a.467d6.1e2f5b84>