[src/trunk]: src fix the parts that build libgcc/crtstuff, etc., for GCC 4.5.

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

details:   https://anonhg.NetBSD.org/src/rev/311461b1c753
branches:  trunk
changeset: 766423:311461b1c753
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 22 05:13:20 2011 +0000

description:
fix the parts that build libgcc/crtstuff, etc., for GCC 4.5.

diffstat:

 Makefile |  26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diffs (69 lines):

diff -r 32de5a92fdfd -r 311461b1c753 Makefile
--- a/Makefile  Wed Jun 22 05:09:25 2011 +0000
+++ b/Makefile  Wed Jun 22 05:13:20 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.284 2011/06/20 06:52:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.285 2011/06/22 05:13:20 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -201,8 +201,12 @@
 .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "4"
 LIBGCC_EXT=4
+BUILD_CC_LIB_BASEDIR= gnu/lib
+BUILD_CC_LIB_BASETARGET= gnu-lib
 .else
-LIBGCC_EXT=45
+LIBGCC_EXT=
+BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif
 .endif
 
@@ -408,10 +412,12 @@
 .endfor
 
 .if defined(HAVE_GCC)
+.    if ${HAVE_GCC} != 45      # XXX for now
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
+BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
 .endif
-BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
+BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT}
+.    endif
 .elif defined(HAVE_PCC)
 BUILD_CC_LIB+= external/bsd/pcc/crtstuff
 BUILD_CC_LIB+= external/bsd/pcc/libpcc
@@ -442,22 +448,26 @@
 
 do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
+.    if ${HAVE_GCC} != 45      # XXX for now
 .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-       ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
+       ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif
-       ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
+       ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif
+.    endif
 .endif
 
 do-compat-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
+.    if ${HAVE_GCC} != 45      # XXX for now
 .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-       ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
+       ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif
-       ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
+       ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif
+.    endif
 .endif
 
 do-libpcc: .PHONY .MAKE