aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.libcompat
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2019-10-11 21:28:02 +0000
committerBrooks Davis <brooks@FreeBSD.org>2019-10-11 21:28:02 +0000
commit571fc82c92ac28eb130fe2972ec753f932707e0e (patch)
tree71fca73e8f0105a2458f1644ed4dd6daa4ea25e4 /Makefile.libcompat
parentdf4d65b1967dbdcd6043c88791ac6c1a5f3d1131 (diff)
downloadsrc-571fc82c92ac28eb130fe2972ec753f932707e0e.tar.gz
src-571fc82c92ac28eb130fe2972ec753f932707e0e.zip
Centralize adding OBJCOPY=${XOBJCOPY} to LIB32WMAKEFLAGS.
Reviewed by: emaste, imp Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D21983
Notes
Notes: svn path=/head/; revision=353449
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r--Makefile.libcompat9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index f2da3bd06587..acd7dcaba101 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -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