[src/trunk]: src/external/gpl3/gcc/usr.bin - fix the path for GCCARCH and GCC...

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

details:   https://anonhg.NetBSD.org/src/rev/1d1b36b1eb8e
branches:  trunk
changeset: 766504:1d1b36b1eb8e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 24 05:27:57 2011 +0000

description:
- fix the path for GCCARCH and GCCARCH
- force DEVPHASE to "release"
-

diffstat:

 external/gpl3/gcc/usr.bin/Makefile.inc |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r f48d1493ba0c -r 1d1b36b1eb8e external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Fri Jun 24 05:26:06 2011 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Fri Jun 24 05:27:57 2011 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.2 2011/06/23 11:47:13 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2011/06/24 05:27:57 mrg Exp $
 
 .include <bsd.own.mk>
 
 TOP=           ${NETBSDSRCDIR}
 DIST=          ${TOP}/external/gpl3/gcc/dist
 
-GCCARCH=       ${.CURDIR}/../arch/${MACHINE_ARCH}
+GCCARCH=       ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}
 
 CPPFLAGS+=     -DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE
 HOST_CPPFLAGS+=        -I${.CURDIR}/..
@@ -21,13 +21,15 @@
 LIBIBERTYOBJ!=         cd ${.CURDIR}/../../lib/libiberty && ${PRINTOBJDIR}
 FRONTENDOBJ!=          cd ${.CURDIR}/../frontend && ${PRINTOBJDIR}
 BACKENDOBJ!=           cd ${.CURDIR}/../backend && ${PRINTOBJDIR}
-LIBCPPOBJ!=            cd ${.CURDIR}/../../lib/libcpp && ${PRINTOBJDIR}
+LIBCPPOBJ!=            cd ${.CURDIR}/../libcpp && ${PRINTOBJDIR}
 
 HOSTLIBIBERTYOBJ!=     cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
 HOSTLIBIBERTY=         ${HOSTLIBIBERTYOBJ}/libiberty/libiberty.a
 
 BASEVER!=              cat ${GNUHOSTDIST}/gcc/BASE-VER
-DEVPHASE!=             cat ${GNUHOSTDIST}/gcc/DEV-PHASE
+# XXX
+#DEVPHASE!=            cat ${GNUHOSTDIST}/gcc/DEV-PHASE
+DEVPHASE="release"
 DATESTAMP!=            cat ${GNUHOSTDIST}/gcc/DATESTAMP
 
 BASEVERSTR=            "\"$(BASEVER)\""