Module Name: src
Committed By: mrg
Date: Tue Mar 30 07:26:23 UTC 2010
Modified Files:
src/usr.bin/elf2aout: Makefile
src/usr.bin/fdformat: Makefile
Log Message:
build elf2aout and fdformat on macppc64 (for now, it's a lot easier than
figuring out how to split the sets... but that will have to happen.)
fixes the first easy part of PR#43075.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/elf2aout/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/fdformat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/elf2aout/Makefile
diff -u src/usr.bin/elf2aout/Makefile:1.7 src/usr.bin/elf2aout/Makefile:1.8
--- src/usr.bin/elf2aout/Makefile:1.7 Wed Aug 12 23:39:13 2009
+++ src/usr.bin/elf2aout/Makefile Tue Mar 30 07:26:23 2010
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2009/08/12 23:39:13 matt Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/30 07:26:23 mrg Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
# Build ELF to {ecoff, aout} tools on m68k/powerpc, for kernels with old amigappc bootblocks.
-.if (${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc")
+.if (${MACHINE_ARCH} == "m68000" || \
+ ${MACHINE_ARCH} == "m68k" || \
+ ${MACHINE_ARCH} == "powerpc" || \
+ ${MACHINE_ARCH} == "powerpc64")
PROG= elf2aout
.endif
Index: src/usr.bin/fdformat/Makefile
diff -u src/usr.bin/fdformat/Makefile:1.12 src/usr.bin/fdformat/Makefile:1.13
--- src/usr.bin/fdformat/Makefile:1.12 Sun Apr 12 02:53:56 2009
+++ src/usr.bin/fdformat/Makefile Tue Mar 30 07:26:23 2010
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2009/04/12 02:53:56 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2010/03/30 07:26:23 mrg Exp $
+
+.include <bsd.own.mk>
.if (${MACHINE_ARCH} == "alpha" || \
- ${MACHINE_ARCH} == "arm" || \
- ${MACHINE_ARCH} == "armeb" || \
+ ${MACHINE_CPU} == "arm" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
- ${MACHINE_ARCH} == "powerpc" || \
+ ${MACHINE_CPU} == "powerpc" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "x86_64")
