Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix addition of C++ .cc source to SRCS

Browse Source 
Fix assumption that all of the source files are .c, as some are .cc.
This commit is contained in:
lukem 2020-06-29 08:34:17 +00:00
parent 96e11f690b
commit 41feef0356
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/gpl3/gcc/usr.bin/cc1/Makefile vendored
View File

@ -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"

5
external/gpl3/gcc/usr.bin/cc1obj/Makefile vendored
View File

@ -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\"

5
external/gpl3/gcc/usr.bin/cc1plus/Makefile vendored
View File

@ -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