Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Oct 2019 21:28:02 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353449 - head
Message-ID:  <201910112128.x9BLS20D055729@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Fri Oct 11 21:28:02 2019
New Revision: 353449
URL: https://svnweb.freebsd.org/changeset/base/353449

Log:
  Centralize adding OBJCOPY=${XOBJCOPY} to LIB32WMAKEFLAGS.
  
  Reviewed by:	emaste, imp
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D21983

Modified:
  head/Makefile.libcompat

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Fri Oct 11 21:23:46 2019	(r353448)
+++ head/Makefile.libcompat	Fri Oct 11 21:28:02 2019	(r353449)
@@ -24,8 +24,7 @@ LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
 		AS="${XAS} --32" \
-		LD="${XLD} -m elf_i386_fbsd -L${LIBCOMPATTMP}/usr/lib32" \
-		OBJCOPY="${XOBJCOPY}"
+		LD="${XLD} -m elf_i386_fbsd -L${LIBCOMPATTMP}/usr/lib32"
 
 .elif ${TARGET_ARCH} == "powerpc64"
 .if empty(TARGET_CPUTYPE)
@@ -36,8 +35,7 @@ LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 LIB32CPUFLAGS+=	-m32
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
-		LD="${XLD} -m elf32ppc_fbsd" \
-		OBJCOPY="${XOBJCOPY}"
+		LD="${XLD} -m elf32ppc_fbsd"
 
 .elif ${TARGET_ARCH:Mmips64*} != ""
 .if ${WANT_COMPILER_TYPE} == gcc || \
@@ -61,11 +59,10 @@ LIB32WMAKEFLAGS= LD="${XLD} -m elf32ltsmip_fbsd"
 .else
 LIB32WMAKEFLAGS= LD="${XLD} -m elf32btsmip_fbsd"
 .endif
-LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}"
 .endif
 
 LIB32WMAKEFLAGS+= NM="${XNM}"
-
+LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}"
 
 LIB32CFLAGS=	-DCOMPAT_32BIT
 LIB32DTRACE=	${DTRACE} -32



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