Module Name: src
Committed By: lukem
Date: Mon Jun 29 08:34:17 UTC 2020
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
Fix addition of C++ .cc source to SRCS
Fix assumption that all of the source files are .c, as some are .cc.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.17 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.18
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.17 Tue Apr 28 05:45:15 2020
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Mon Jun 29 08:34:17 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2020/04/28 05:45:15 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/29 08:34:17 lukem Exp $
PROG= cc1
-SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
+SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS+= main.c ${PROG}-checksum.c
CPPFLAGS+= -DPREFIX=\"/usr\"
.include "../Makefile.backend"
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.15 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.16
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.15 Tue Apr 28 07:47:54 2020
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Mon Jun 29 08:34:17 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2020/04/28 07:47:54 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2020/06/29 08:34:17 lukem Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
-SRCS= ${MYOBJS:S,objc/,,:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
+SRCS= ${MYOBJS:S,objc/,,:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS+= main.c ${PROG}-checksum.c
CPPFLAGS+= -I${DIST}/gcc/objc
CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\"
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.12 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.13
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.12 Tue Apr 28 07:47:54 2020
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Mon Jun 29 08:34:17 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2020/04/28 07:47:54 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/29 08:34:17 lukem Exp $
PROG= cc1plus
-SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
+SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS+= main.c ${PROG}-checksum.c
# XXX
NOMAN= 1
