summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2004-01-05 01:33:41 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2004-01-05 01:33:41 +0000
commitcf3faa425753da1b4faf21efeff1143177d376da (patch)
tree6b6275123916d2fef4eed6801c76cafd486e96d4
parentdfc9ddd923d2d6ea7c0d9435c946ed7580b0c6f3 (diff)
abcomodate cross for the new nm+size
-rw-r--r--Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index f052062a7a2..7e241423f4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2003/12/14 10:02:57 matthieu Exp $
+# $OpenBSD: Makefile,v 1.96 2004/01/05 01:33:40 mickey Exp $
#
# For more information on building in tricky environments, please see
@@ -181,7 +181,7 @@ BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \
strings strip
NEW_BINUTILS?= Yes
.else
-BINUTILS= ar as ld nm ranlib objcopy objdump size strings strip
+BINUTILS= ar as ld nm ranlib objcopy objdump strings strip
NEW_BINUTILS?= No
.endif
@@ -239,15 +239,6 @@ ${CROSSBINUTILS}: ${CROSSINCLUDES}
NOMAN= install)
ln -sf ${CROSSDIR}/usr/bin/strip \
${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
- (cd ${.CURDIR}/usr.bin/size; \
- MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
- NOMAN= depend all; \
- DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- ${MAKE} NOMAN= install)
- ln -sf ${CROSSDIR}/usr/bin/size \
- ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size
(cd ${.CURDIR}/usr.bin/nm; \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
@@ -257,6 +248,8 @@ ${CROSSBINUTILS}: ${CROSSINCLUDES}
${MAKE} NOMAN= install)
ln -sf ${CROSSDIR}/usr/bin/nm \
${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
+ ln -sf ${CROSSDIR}/usr/bin/size \
+ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
.endif
@for cmd in ${BINUTILS}; do \
if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \