From d26da1a6c3d1e0bb806762f3e8053ac44dd2368a Mon Sep 17 00:00:00 2001 From: mrg Date: Sat, 31 May 2014 22:55:16 +0000 Subject: [PATCH] make sure that files containing version numbers are rebuilt when the version actually changes. --- external/gpl3/gcc/usr.bin/Makefile.gcc-tool | 4 +++- external/gpl3/gcc/usr.bin/Makefile.inc | 3 ++- external/gpl3/gcc/usr.bin/cc1/Makefile | 3 ++- external/gpl3/gcc/usr.bin/cc1obj/Makefile | 3 ++- external/gpl3/gcc/usr.bin/cc1plus/Makefile | 3 ++- external/gpl3/gcc/usr.bin/common-target/Makefile | 4 +++- external/gpl3/gcc/usr.bin/common/Makefile | 4 +++- external/gpl3/gcc/usr.bin/cpp/Makefile | 4 +++- external/gpl3/gcc/usr.bin/frontend/Makefile | 4 +++- external/gpl3/gcc/usr.bin/g++/Makefile | 4 +++- external/gpl3/gcc/usr.bin/gcc/Makefile | 4 +++- 11 files changed, 29 insertions(+), 11 deletions(-) diff --git a/external/gpl3/gcc/usr.bin/Makefile.gcc-tool b/external/gpl3/gcc/usr.bin/Makefile.gcc-tool index 6a8e3fb38d02..d439a1b74070 100644 --- a/external/gpl3/gcc/usr.bin/Makefile.gcc-tool +++ b/external/gpl3/gcc/usr.bin/Makefile.gcc-tool @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.gcc-tool,v 1.1 2014/03/01 10:00:49 mrg Exp $ +# $NetBSD: Makefile.gcc-tool,v 1.2 2014/05/31 22:55:16 mrg Exp $ PROG= gcc-${GCC_TOOL} SRCS= gcc-ar.c file-find.c @@ -15,6 +15,8 @@ CPPFLAGS= \ # Skip these because we don't have them in paths. # -DDEFAULT_TARGET_VERSION=\"${G_version}\" # -DDEFAULT_TARGET_MACHINE=\"{GNU_MACHINE_ARCH}\" +# +# ${SRCS}: ${GCCARCH}/defs.mk CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} diff --git a/external/gpl3/gcc/usr.bin/Makefile.inc b/external/gpl3/gcc/usr.bin/Makefile.inc index 2620f3c8aaf6..3cf35379228b 100644 --- a/external/gpl3/gcc/usr.bin/Makefile.inc +++ b/external/gpl3/gcc/usr.bin/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.22 2014/05/29 07:40:37 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.23 2014/05/31 22:55:16 mrg Exp $ .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_ _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1 @@ -79,6 +79,7 @@ VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\" \ -DBUGURL=$(G_BUGURL_s) CPPFLAGS.version.c+= ${VER_CPPFLAGS} +version.c: ${GCCARCH}/defs.mk ${TOP}/tools/gcc/gcc-version.mk .include "${GCCARCH}/defs.mk" diff --git a/external/gpl3/gcc/usr.bin/cc1/Makefile b/external/gpl3/gcc/usr.bin/cc1/Makefile index eb54637024ee..79e61f6c68a3 100644 --- a/external/gpl3/gcc/usr.bin/cc1/Makefile +++ b/external/gpl3/gcc/usr.bin/cc1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/03/22 19:52:21 tron Exp $ +# $NetBSD: Makefile,v 1.9 2014/05/31 22:55:17 mrg Exp $ PROG= cc1 SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c @@ -30,6 +30,7 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \ # VER_CPPFLAGS from Makefile.inc CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} +c-cppbuiltin.c: ${GCCARCH}/defs.mk COPTS.c-ada-spec.c= -Wno-stack-protector COPTS.c-aux-info.c= -Wno-stack-protector diff --git a/external/gpl3/gcc/usr.bin/cc1obj/Makefile b/external/gpl3/gcc/usr.bin/cc1obj/Makefile index 17f834bc18aa..1261657bcb28 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.7 2014/03/22 17:57:47 tron Exp $ +# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $ MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} PROG= cc1obj @@ -33,6 +33,7 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \ # VER_CPPFLAGS from Makefile.inc CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} +c-cppbuiltin.c: ${GCCARCH}/defs.mk COPTS.c-ada-spec.c+= -Wno-stack-protector COPTS.c-aux-info.c+= -Wno-stack-protector diff --git a/external/gpl3/gcc/usr.bin/cc1plus/Makefile b/external/gpl3/gcc/usr.bin/cc1plus/Makefile index a871a21c2acb..7e565dadb01c 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.8 2014/04/04 01:19:57 christos Exp $ +# $NetBSD: Makefile,v 1.9 2014/05/31 22:55:17 mrg Exp $ PROG= cc1plus SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c @@ -33,6 +33,7 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbacktrace.a \ ## VER_CPPFLAGS from Makefile.inc #CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} +#c-cppbuiltin.c: ${GCCARCH}/defs.mk # YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN CFLAGS+= -Wno-error # not good enough: -Wno-return-type diff --git a/external/gpl3/gcc/usr.bin/common-target/Makefile b/external/gpl3/gcc/usr.bin/common-target/Makefile index a02f503276a0..2feb3dad8e3d 100644 --- a/external/gpl3/gcc/usr.bin/common-target/Makefile +++ b/external/gpl3/gcc/usr.bin/common-target/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/03/15 23:12:58 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2014/05/31 22:55:17 mrg Exp $ LIBISPRIVATE= yes @@ -27,6 +27,8 @@ GENPROG_ERROR_DEPENDS=errors.lo .include "../Makefile.options" .include "../../Makefile.hooks" +${SRCS}: ${GCCARCH}/defs.mk + ${G_common_out_file:T:R}.o: common/common-target-hooks-def.h DPSRCS+= options.h diff --git a/external/gpl3/gcc/usr.bin/common/Makefile b/external/gpl3/gcc/usr.bin/common/Makefile index e9386528e603..25d84f2e6135 100644 --- a/external/gpl3/gcc/usr.bin/common/Makefile +++ b/external/gpl3/gcc/usr.bin/common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $ +# $NetBSD: Makefile,v 1.3 2014/05/31 22:55:17 mrg Exp $ LIBISPRIVATE= yes @@ -25,6 +25,8 @@ HOSTPROG_CXX= 1 COPTS.diagnostic.c= -Wno-stack-protector COPTS.intl.c= -Wno-stack-protector +${SRCS}: ${GCCARCH}/defs.mk + .include # Force using C++ for this diff --git a/external/gpl3/gcc/usr.bin/cpp/Makefile b/external/gpl3/gcc/usr.bin/cpp/Makefile index 4407b789527d..4ba21160b36a 100644 --- a/external/gpl3/gcc/usr.bin/cpp/Makefile +++ b/external/gpl3/gcc/usr.bin/cpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:48 tron Exp $ +# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $ PROG= cpp SRCS= cppspec.c ${G_GCC_OBJS:.o=.c} @@ -24,6 +24,8 @@ DPADD+= ${LIBINTL} .include "../Makefile.frontend" +${SRCS}: ${GCCARCH}/defs.mk + .include COPTS.gcc.c= -Wno-stack-protector diff --git a/external/gpl3/gcc/usr.bin/frontend/Makefile b/external/gpl3/gcc/usr.bin/frontend/Makefile index 2608eb6e2fa9..ed4446594b3e 100644 --- a/external/gpl3/gcc/usr.bin/frontend/Makefile +++ b/external/gpl3/gcc/usr.bin/frontend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:49 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $ LIBISPRIVATE= yes @@ -31,6 +31,8 @@ HOST_CPPFLAGS+= -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} DPSRCS+= specs.h +${SRCS}: ${GCCARCH}/defs.mk + MKPIC:= no MKPICLIB:= no diff --git a/external/gpl3/gcc/usr.bin/g++/Makefile b/external/gpl3/gcc/usr.bin/g++/Makefile index 2fb2c4885ccf..c86ac212c3cf 100644 --- a/external/gpl3/gcc/usr.bin/g++/Makefile +++ b/external/gpl3/gcc/usr.bin/g++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $ +# $NetBSD: Makefile,v 1.5 2014/05/31 22:55:17 mrg Exp $ PROG= gplusplus PROGNAME= g++ @@ -20,6 +20,8 @@ DPADD+= ${LIBINTL} .include "../Makefile.frontend" +${SRCS}: ${GCCARCH}/defs.mk + COPTS.gcc.c= -Wno-stack-protector .PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/cp diff --git a/external/gpl3/gcc/usr.bin/gcc/Makefile b/external/gpl3/gcc/usr.bin/gcc/Makefile index 2d95bea88516..c70d1757d50d 100644 --- a/external/gpl3/gcc/usr.bin/gcc/Makefile +++ b/external/gpl3/gcc/usr.bin/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $ +# $NetBSD: Makefile,v 1.5 2014/05/31 22:55:17 mrg Exp $ PROG= gcc SRCS= gccspec.c ${G_GCC_OBJS:.o=.c} @@ -24,6 +24,8 @@ DPADD+= ${LIBINTL} .include "../Makefile.frontend" +${SRCS}: ${GCCARCH}/defs.mk + .include COPTS.gcc.c= -Wno-stack-protector