[src/trunk]: src/tools/gcc define GCCDIST properly for GCC 4.1, and since it ...

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

details:   https://anonhg.NetBSD.org/src/rev/633f41aecc1f
branches:  trunk
changeset: 327126:633f41aecc1f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Feb 27 20:15:53 2014 +0000

description:
define GCCDIST properly for GCC 4.1, and since it is now the same
as GCCSRCDIR remove the latter.

diffstat:

 tools/gcc/Makefile |  18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diffs (45 lines):

diff -r e5883ee3b0e5 -r 633f41aecc1f tools/gcc/Makefile
--- a/tools/gcc/Makefile        Thu Feb 27 18:20:21 2014 +0000
+++ b/tools/gcc/Makefile        Thu Feb 27 20:15:53 2014 +0000
@@ -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 @@
                        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 @@
                        --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}