[src/trunk]: src/gnu/usr.bin On m68k, descend into gas only if not using ELF.

[kleink <kleink%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/416825005db3
branches:  trunk
changeset: 472483:416825005db3
user:      kleink <kleink%NetBSD.org@localhost>
date:      Fri Apr 30 14:57:23 1999 +0000

description:
On m68k, descend into gas only if not using ELF.

diffstat:

 gnu/usr.bin/Makefile |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r b99fed5e581e -r 416825005db3 gnu/usr.bin/Makefile
--- a/gnu/usr.bin/Makefile      Fri Apr 30 14:53:53 1999 +0000
+++ b/gnu/usr.bin/Makefile      Fri Apr 30 14:57:23 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.87 1999/04/30 14:46:07 kleink Exp $
+#      $NetBSD: Makefile,v 1.88 1999/04/30 14:57:23 kleink Exp $
 
 # for OBJECT_FMT
 .include <bsd.own.mk>
@@ -11,18 +11,18 @@
 SUBDIR+=       gdb
 .endif
 
-.if (${MACHINE_ARCH} == "m68k") || \
+.if (${MACHINE_ARCH} == "m68k") && ${OBJECT_FMT} != "ELF") ||  \
     (${MACHINE_ARCH} == "ns32k")
 SUBDIR+=       gas
 .else
 SUBDIR+=       gas.new
 .endif
 
-.if (${MACHINE_ARCH} == "arm32") || \
-    (${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} != "ELF") || \
-    (${MACHINE_ARCH} == "m68k") && ${OBJECT_FMT} != "ELF") || \
-    (${MACHINE_ARCH} == "ns32k") || \
-    (${MACHINE_ARCH} == "sparc" && ${OBJECT_FMT} != "ELF") || \
+.if (${MACHINE_ARCH} == "arm32") ||                            \
+    (${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} != "ELF") ||   \
+    (${MACHINE_ARCH} == "m68k") && ${OBJECT_FMT} != "ELF") ||  \
+    (${MACHINE_ARCH} == "ns32k") ||                            \
+    (${MACHINE_ARCH} == "sparc" && ${OBJECT_FMT} != "ELF") ||  \
     (${MACHINE_ARCH} == "vax")
 SUBDIR+=       ld
 .endif