From 30b4ed22df1ebebcca32e9301f385f0938d3c36c Mon Sep 17 00:00:00 2001 From: mrg Date: Wed, 29 Jun 2011 01:57:59 +0000 Subject: [PATCH] - build libdecnumber - don't build protoize/unprotoize - use libdecnumber and VER_CPPFLAGS --- external/gpl3/gcc/usr.bin/Makefile | 6 +++--- external/gpl3/gcc/usr.bin/cc1obj/Makefile | 8 +++++++- external/gpl3/gcc/usr.bin/cc1plus/Makefile | 8 +++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/external/gpl3/gcc/usr.bin/Makefile b/external/gpl3/gcc/usr.bin/Makefile index f6e8f7bbfc00..2b759844ab31 100644 --- a/external/gpl3/gcc/usr.bin/Makefile +++ b/external/gpl3/gcc/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/06/24 05:25:24 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2011/06/29 01:57:59 mrg Exp $ NOOBJ=# defined @@ -11,9 +11,9 @@ NOOBJ=# defined SUBDIR+= host-libiberty .WAIT \ backend .WAIT \ frontend .WAIT \ - libcpp gcov .WAIT \ + libcpp libdecnumber gcov .WAIT \ cc1 cc1obj cc1plus cpp g++ gcc \ - include protoize unprotoize + include .include diff --git a/external/gpl3/gcc/usr.bin/cc1obj/Makefile b/external/gpl3/gcc/usr.bin/cc1obj/Makefile index 5a9d28254ce2..b4aa6c40a6fb 100644 --- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile +++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/06/21 06:03:13 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $ MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} PROG= cc1obj @@ -9,7 +9,13 @@ CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\" .include "../Makefile.backend" .include "../Makefile.libcpp" +.include "../Makefile.libdecnumber" + +# VER_CPPFLAGS from Makefile.inc +CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} COPTS+= -Wno-stack-protector +LDADD+= -lintl -lgmp -lmpfr -lmpc -lz + .PATH: ${DIST}/gcc/objc ${DIST}/gcc ${G_out_file:H} diff --git a/external/gpl3/gcc/usr.bin/cc1plus/Makefile b/external/gpl3/gcc/usr.bin/cc1plus/Makefile index b6aec0c1cfa8..067626a3481c 100644 --- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile +++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/06/21 06:03:13 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $ PROG= cc1plus SRCS= ${G_CXX_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c @@ -8,8 +8,14 @@ CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\" .include "../Makefile.backend" .include "../Makefile.libcpp" +.include "../Makefile.libdecnumber" + +# VER_CPPFLAGS from Makefile.inc +CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} # YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN CFLAGS+= -Wno-error # not good enough: -Wno-return-type +LDADD+= -lintl -lgmp -lmpfr -lmpc -lz + .PATH: ${DIST}/gcc/cp ${DIST}/gcc ${G_out_file:H}