Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Apr 2015 20:38:32 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r281382 - stable/10
Message-ID:  <201504102038.t3AKcWQ5019113@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Fri Apr 10 20:38:31 2015
New Revision: 281382
URL: https://svnweb.freebsd.org/changeset/base/281382

Log:
  MFC r272814 (by bapt):
  
    Add OBJCOPY to the list of external tools
  
  MFC r272815 (by bapt):
  
    Fix typo
  
  This should fix the build troubles some people have been seeing after
  the MFC of r280980 (in r281289).  Sorry for the breakage.

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Fri Apr 10 19:26:45 2015	(r281381)
+++ stable/10/Makefile.inc1	Fri Apr 10 20:38:31 2015	(r281382)
@@ -311,7 +311,7 @@ X${COMPILER}?=	${CROSS_COMPILER_PREFIX}$
 X${COMPILER}?=	${${COMPILER}}
 .endif
 .endfor
-XBINUTILS=	AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS=	AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX)
 X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +322,8 @@ X${BINUTIL}?=	${${BINUTIL}}
 WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
 		CPP="${XCPP} ${XFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
-		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+		OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
+		RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
 
 .if ${XCC:T:Mgcc} == "gcc"
 WMAKE_COMPILER_TYPE=	gcc



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