Pass CFLAGS onto GNU build.

Set g++ include to /usr/include/g++.

diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index cb3c832..4972e9b 100644 (file)
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,24 +1,25 @@
-#      $Id: Makefile.bsd-wrapper,v 1.4 1996/02/02 00:22:56 niklas Exp $
+#      $Id: Makefile.bsd-wrapper,v 1.5 1996/02/04 10:52:33 etheisen Exp $
 
-MAN=   cccp.1 gcc.1 cp/g++.1
-MLINKS=        gcc.1 cc.1
+MAN=           cccp.1 gcc.1 cp/g++.1
+MLINKS=                gcc.1 cc.1
+GNUCFLAGS=     CFLAGS="${CFLAGS}"
 
 all:   config.status
-       ${MAKE} BISON=yacc LDFLAGS=${LDSTATIC}
+       ${MAKE} ${GNUCFLAGS} BISON=yacc LDFLAGS=${LDSTATIC}
 
 .FORCE:        .IGNORE
 
 config: .FORCE
        -rm -f config.cache
        /bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
-               --prefix=/usr
+               --prefix=/usr --gxx-include=/usr/include/g++
 
 config.status:
        /bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
-               --prefix=/usr
+               --prefix=/usr --gxx-include=/usr/include/g++
 
 install:       maninstall
-       ${MAKE} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
+       ${MAKE} ${GNUCFLAGS} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
                tooldir=/tmp assertdir=/tmp INSTALL_MAN= NO_TARGET_GCC=true \
                bindir=${DESTDIR}/usr/bin install
        ln -f ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc