Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Jun 2018 23:40:39 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r335393 - head
Message-ID:  <201806192340.w5JNedwW004921@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Jun 19 23:40:39 2018
New Revision: 335393
URL: https://svnweb.freebsd.org/changeset/base/335393

Log:
  Let CROSS_BINUTILS_PREFIX work without a trailing slash.
  
  Reported by:	jhb
  MFC after:	2 weeks
  Sponsored by:	Dell EMC

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Jun 19 23:40:36 2018	(r335392)
+++ head/Makefile.inc1	Tue Jun 19 23:40:39 2018	(r335393)
@@ -211,8 +211,8 @@ CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebs
 XBINUTILS=	AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX) && \
-    exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}})
-X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
+    exists(${CROSS_BINUTILS_PREFIX}/${${BINUTIL}})
+X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX:C,/*$,,}/${${BINUTIL}}
 .else
 X${BINUTIL}?=	${${BINUTIL}}
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806192340.w5JNedwW004921>