A stab at controlling SUBDIRS per arch, still problematic, but works

as commentary for the moment

diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index a4a4182..dcfd24c 100644 (file)
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,11 +1,24 @@
-#      $OpenBSD: Makefile.bsd-wrapper,v 1.7 1996/11/23 03:32:21 niklas Exp $
-
-MAN=   binutils/ar.1 binutils/nlmconv.1 binutils/nm.1 binutils/objcopy.1 \
-       binutils/objdump.1 binutils/ranlib.1 binutils/size.1 \
-       binutils/strings.1 binutils/strip.1 gas/doc/as.1 ld/ld.1
-
+#      $OpenBSD: Makefile.bsd-wrapper,v 1.8 1996/11/30 23:13:41 niklas Exp $
+
+MAN=           binutils/ar.1 binutils/nlmconv.1 binutils/nm.1 \
+               binutils/objcopy.1 binutils/objdump.1 binutils/ranlib.1 \
+               binutils/size.1 binutils/strings.1 binutils/strip.1 \
+               gas/doc/as.1 ld/ld.1
+
+SUBDIRS=       libiberty opcodes bfd
+# When enabling gdb, enable these too
+.if (${MACHINE_ARCH} != "mips") && (${MACHINE_ARCH} != "alpha")
+SUBDIRS+=      mmalloc readline 
+.endif
+SUBDIRS+=      binutils ld gas
+# GDB not ready yet
+.if (${MACHINE_ARCH} != "mips") && (${MACHINE_ARCH} != "alpha")
+SUBDIRS+=      gdb
+.endif
+       
 all:   config.status
-       ${MAKE} LDFLAGS=${LDSTATIC}
+       ${MAKE} CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS=${LDSTATIC} \
+               SUBDIRS="${SUBDIRS}"
 
 .FORCE:        .IGNORE