Tue Feb 18 01:34:18 2014 UTC ()
put back some cppflags we lost.


(christos)
diff -r1.63 -r1.64 src/tools/gcc/Makefile
cvs diff -r1.63 -r1.64 src/tools/gcc/Makefile (expand / switch to unified diff)

--- src/tools/gcc/Makefile 2014/02/17 21:39:43 1.63
+++ src/tools/gcc/Makefile 2014/02/18 01:34:18 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.63 2014/02/17 21:39:43 christos Exp $ 1# $NetBSD: Makefile,v 1.64 2014/02/18 01:34:18 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5GCC_LANGUAGES=c c++ objc 5GCC_LANGUAGES=c c++ objc
6MODULE= gcc4 6MODULE= gcc4
7 7
8.if ${HAVE_GCC} == 48 8.if ${HAVE_GCC} == 48
9CC_FOR_BUILD= ${HOST_CXX:Q} 9CC_FOR_BUILD= ${HOST_CXX:Q}
10LIB_INTL= 10LIB_INTL=
11MKNATIVE= ${.CURDIR}/mknative-gcc48 11MKNATIVE= ${.CURDIR}/mknative-gcc48
12GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/yagcc/dist 12GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/yagcc/dist
13.elif ${HAVE_GCC} == 45 13.elif ${HAVE_GCC} == 45
14GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist 14GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
@@ -49,27 +49,28 @@ CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} @@ -49,27 +49,28 @@ CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
49CONFIGURE_ARGS+= \ 49CONFIGURE_ARGS+= \
50 --with-sysroot=${DESTDIR} \ 50 --with-sysroot=${DESTDIR} \
51 --with-mpc=${TOOLDIR} \ 51 --with-mpc=${TOOLDIR} \
52 --with-mpfr=${TOOLDIR} \ 52 --with-mpfr=${TOOLDIR} \
53 --with-gmp=${TOOLDIR} 53 --with-gmp=${TOOLDIR}
54.endif 54.endif
55CONFIGURE_ARGS+= \ 55CONFIGURE_ARGS+= \
56 --disable-nls \ 56 --disable-nls \
57 ${MULTILIB_ARGS} \ 57 ${MULTILIB_ARGS} \
58 ${SOFTFLOAT_ARGS} \ 58 ${SOFTFLOAT_ARGS} \
59 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \ 59 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
60 --enable-languages="${GCC_LANGUAGES}" 60 --enable-languages="${GCC_LANGUAGES}"
61 61
62GCC_CPPFLAGS= -DNETBSD_TOOLS 62GCC_CPPFLAGS= -DNETBSD_TOOLS -DTARGET_SYSTEM_ROOT=0 \
 63 -DTARGET_SYSTEM_ROOT_RELOCATABLE
63 64
64MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \ 65MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
65 LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \ 66 LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
66 EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \ 67 EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \
67 AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q} 68 AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q}
68 69
69CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \ 70CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \
70 gcc_cv_as_sparc_gotdata_op=no 71 gcc_cv_as_sparc_gotdata_op=no
71 72
72ALL_TARGET= all-gcc 73ALL_TARGET= all-gcc
73INSTALL_TARGET= install-gcc 74INSTALL_TARGET= install-gcc
74 75
75.include "${.CURDIR}/../Makefile.gmakehost" 76.include "${.CURDIR}/../Makefile.gmakehost"