Module Name: src
Committed By: mrg
Date: Wed Jun 29 02:05:25 UTC 2011
Modified Files:
src: Makefile
src/external/gpl3: Makefile
src/external/gpl3/gcc/lib: Makefile
src/lib: Makefile
Log Message:
re-enable the gcc 4.5 crtstuff/libgcc builders now that they work.
also build the gmp, mpfr and mpc libraries in this case.
To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/Makefile
cvs rdiff -u -r1.169 -r1.170 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.285 src/Makefile:1.286
--- src/Makefile:1.285 Wed Jun 22 05:13:20 2011
+++ src/Makefile Wed Jun 29 02:05:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.285 2011/06/22 05:13:20 mrg Exp $
+# $NetBSD: Makefile,v 1.286 2011/06/29 02:05:24 mrg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -412,12 +412,10 @@
.endfor
.if defined(HAVE_GCC)
-. if ${HAVE_GCC} != 45 # XXX for now
.if ${USE_COMPILERCRTSTUFF} == "yes"
BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
.endif
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
@@ -448,26 +446,22 @@
do-libgcc: .PHONY .MAKE
.if defined(HAVE_GCC)
-. if ${HAVE_GCC} != 45 # XXX for now
.if ${MKGCC} != "no"
.if ${USE_COMPILERCRTSTUFF} == "yes"
${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
.endif
${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-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
.endif
${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
.endif
-. endif
.endif
do-libpcc: .PHONY .MAKE
Index: src/external/gpl3/Makefile
diff -u src/external/gpl3/Makefile:1.3 src/external/gpl3/Makefile:1.4
--- src/external/gpl3/Makefile:1.3 Tue Jun 21 04:52:49 2011
+++ src/external/gpl3/Makefile Wed Jun 29 02:05:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/21 04:52:49 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/29 02:05:24 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
.if ${HAVE_GCC} == 45
.if ${MKGCCCMDS} != "no"
-#SUBDIR+= gcc
+SUBDIR+= gcc
.endif
.endif
Index: src/external/gpl3/gcc/lib/Makefile
diff -u src/external/gpl3/gcc/lib/Makefile:1.1 src/external/gpl3/gcc/lib/Makefile:1.2
--- src/external/gpl3/gcc/lib/Makefile:1.1 Tue Jun 28 04:23:56 2011
+++ src/external/gpl3/gcc/lib/Makefile Wed Jun 29 02:05:25 2011
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2011/06/28 04:23:56 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/29 02:05:25 mrg Exp $
-SUBDIR+= crtstuff libgcc libiberty libobjc libsupc++ libstdc++-v3
+# crtstuff is built out of elsewhere, or not at all
+SUBDIR+= libgcc libiberty libobjc libsupc++ libstdc++-v3
.include <bsd.subdir.mk>
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.169 src/lib/Makefile:1.170
--- src/lib/Makefile:1.169 Wed Jun 22 05:16:37 2011
+++ src/lib/Makefile Wed Jun 29 02:05:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2011/06/22 05:16:37 mrg Exp $
+# $NetBSD: Makefile,v 1.170 2011/06/29 02:05:25 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -13,10 +13,9 @@
SUBDIR+= ../gnu/lib/libgcc4
. else
. if (${USE_COMPILERCRTSTUFF} == "yes")
-# XXX not yet
-#SUBDIR+= ../external/gpl3/gcc/lib/crtstuff
+SUBDIR+= ../external/gpl3/gcc/lib/crtstuff
. endif
-#SUBDIR+= ../external/gpl3/gcc/lib/libgcc
+SUBDIR+= ../external/gpl3/gcc/lib/libgcc
. endif
.endif
@@ -74,14 +73,15 @@
.if (${MKGCC} != "no")
. if ${HAVE_GCC} == 4
SUBDIR+= ../gnu/lib/libobjc4
+. else
+SUBDIR+= ../external/gpl3/gcc/lib/libobjc
. endif
.endif
. if ${HAVE_GCC} >= 45
-# XXX not yet
-#SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
-#SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
-#SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
+SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
+SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
+SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
.endif
#
@@ -127,6 +127,9 @@
. if ${HAVE_GCC} == 4
SUBDIR+= ../gnu/lib/libstdc++-v3_4 # depends on libm
SUBDIR+= ../gnu/lib/libsupc++4
+. else
+SUBDIR+= ../external/gpl3/gcc/lib/libstdc++-v3
+SUBDIR+= ../external/gpl3/gcc/lib/libsupc++
. endif
.endif
