Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/gpl3/gcc/usr.bin Fix addition of C++ .cc source to ...
details: https://anonhg.NetBSD.org/src/rev/0334e4e272c3
branches: trunk
changeset: 973373:0334e4e272c3
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Jun 29 08:34:17 2020 +0000
description:
Fix addition of C++ .cc source to SRCS
Fix assumption that all of the source files are .c, as some are .cc.
diffstat:
external/gpl3/gcc/usr.bin/cc1/Makefile | 5 +++--
external/gpl3/gcc/usr.bin/cc1obj/Makefile | 5 +++--
external/gpl3/gcc/usr.bin/cc1plus/Makefile | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diffs (43 lines):
diff -r 4cb6168833f8 -r 0334e4e272c3 external/gpl3/gcc/usr.bin/cc1/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1/Makefile Mon Jun 29 08:30:42 2020 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1/Makefile Mon Jun 29 08:34:17 2020 +0000
@@ -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"
diff -r 4cb6168833f8 -r 0334e4e272c3 external/gpl3/gcc/usr.bin/cc1obj/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile Mon Jun 29 08:30:42 2020 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile Mon Jun 29 08:34:17 2020 +0000
@@ -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\"
diff -r 4cb6168833f8 -r 0334e4e272c3 external/gpl3/gcc/usr.bin/cc1plus/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile Mon Jun 29 08:30:42 2020 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile Mon Jun 29 08:34:17 2020 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index