summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2011-06-22 05:13:20 +0000
committermrg <mrg@NetBSD.org>2011-06-22 05:13:20 +0000
commit99e8b364d220d7a25920d1325b7ac37e9ed0fa32 (patch)
tree4103ce85ed0129b2441821d5e1ccd726fa65c12d /Makefile
parent0f84e8c0f76c43087a02601942eb708fb775b4f8 (diff)
fix the parts that build libgcc/crtstuff, etc., for GCC 4.5.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 18 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 5cfb56c47b2..86bac63d198 100644
--- a/Makefile
+++ b/Makefile
@@ -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 @@ postinstall-fix-obsolete: .NOTMAIN .PHONY
.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 @@ do-${targ}: .PHONY ${targ}
.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-tools-obj: .PHONY .MAKE
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