Module Name: src
Committed By: mrg
Date: Thu Feb 27 20:15:53 UTC 2014
Modified Files:
src/tools/gcc: Makefile
Log Message:
define GCCDIST properly for GCC 4.1, and since it is now the same
as GCCSRCDIR remove the latter.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.65 src/tools/gcc/Makefile:1.66
--- src/tools/gcc/Makefile:1.65 Wed Feb 26 09:54:34 2014
+++ src/tools/gcc/Makefile Thu Feb 27 20:15:53 2014
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.65 2014/02/26 09:54:34 mrg Exp $
+# $NetBSD: Makefile,v 1.66 2014/02/27 20:15:53 mrg Exp $
.include <bsd.own.mk>
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
-GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
-GNUHOSTDIST= ${GCCDIST}
+.if ${HAVE_GCC} < 45
+GCCDIST= ${.CURDIR}/../../gnu/dist/gcc4
+.else
+GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
+.endif
+GNUHOSTDIST= ${GCCDIST}
.if ${HAVE_GCC} == 48
CC_FOR_BUILD= ${HOST_CXX:Q}
@@ -124,12 +128,6 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
gdb_cv_scanf_has_long_double=yes \
gcc_cv_as_sparc_gotdata_op=no
-.if ${HAVE_GCC} < 45
-GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
-.else
-GCCSRCDIR=${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
-.endif
-
CXXADDFLAGS= --sysroot=${DESTDIR}
CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
@@ -189,7 +187,7 @@ NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
--disable-libstdcxx-pch \
- --build=`${GCCSRCDIR}/config.guess` \
+ --build=`${GCCDIST}/config.guess` \
--host=${MACHINE_GNU_PLATFORM} \
--with-sysroot=${DESTDIR}
MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
