CVS commit: src/external/gpl3/gcc/usr.bin/cpp
Module Name:src
Committed By: mrg
Date: Sat Feb 9 07:32:50 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
Log Message:
make sure Makefile.inc is included before Makefile.driver.
allows removing a depend hack and may also fix dtrace/ctf builds.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cpp/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/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10 Fri Feb 1 10:36:33 2019
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Sat Feb 9 07:32:50 2019
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/09 07:32:50 mrg Exp $
+
+.include
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
+.include "../Makefile.driver"
.include "../Makefile.target-defines"
COPTS+= -Wno-stack-protector
@@ -18,11 +21,8 @@ INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/g
LDADD+= -lintl
DPADD+= ${LIBINTL}
-.include
-
ADD_FRONTEND_LIBRARY= no
.include "../Makefile.frontend"
-.include "../Makefile.driver"
${SRCS}: ${GCCARCH}/defs.mk
@@ -33,6 +33,3 @@ COPTS.gcc.c= -Wno-stack-protector
.PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
cpp.info: gcc-vers.texi
-
-# XXX - driver-i386.o isn't built otherwise
-${PROG}: ${OBJS}
CVS commit: src/external/gpl3/gcc/usr.bin/cpp
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:36:33 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
Log Message:
- use ADD_FRONTEND_LIBRARY to avoid linking libfrontend
- add a hack to ensure driver-i386.c gets built before linking
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/cpp/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/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.9 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.9 Tue Mar 15 19:12:06 2016
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Fri Feb 1 10:36:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/03/15 19:12:06 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
@@ -18,7 +18,11 @@ INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/g
LDADD+= -lintl
DPADD+= ${LIBINTL}
+.include
+
+ADD_FRONTEND_LIBRARY= no
.include "../Makefile.frontend"
+.include "../Makefile.driver"
${SRCS}: ${GCCARCH}/defs.mk
@@ -29,3 +33,6 @@ COPTS.gcc.c= -Wno-stack-protector
.PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
cpp.info: gcc-vers.texi
+
+# XXX - driver-i386.o isn't built otherwise
+${PROG}: ${OBJS}
CVS commit: src/external/gpl3/gcc/usr.bin/cpp
Module Name:src
Committed By: mrg
Date: Wed Jun 29 02:17:17 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
Log Message:
make this build with GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/cpp/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/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.1 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.1 Tue Jun 21 06:03:14 2011
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Wed Jun 29 02:17:17 2011
@@ -1,11 +1,26 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:03:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/29 02:17:17 mrg Exp $
-.include bsd.own.mk
+# For ../Makefile.inc and bsd.own.mk
+.include bsd.init.mk
PROG= cpp
-SRCS= cppspec.c
+SRCS= gcc.c cppspec.c prefix.c version.c
+
+# XXX
+.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
+SRCS+= driver-i386.c
+.PATH: ${DIST}/gcc/config/i386
+.endif
CPPFLAGS+= -I${BACKENDOBJ}
+CPPFLAGS.prefix.c+= -DPREFIX=\/usr\
+
+CPPFLAGS.gcc.c+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
+ ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
+ -DPREFIX=\/usr\ \
+ -DDEFAULT_TARGET_VERSION=\${G_version}\ \
+ -DDEFAULT_TARGET_MACHINE=\${MACHINE_GNU_PLATFORM}\ \
+ -DCONFIGURE_SPECS=\\
LINKS= ${BINDIR}/cpp ${BINDIR}/gcpp
@@ -17,6 +32,8 @@
.include ../Makefile.frontend
+LDADD+= -lintl
+
.include bsd.info.mk
.PATH: ${DIST}/gcc ${DIST}/gcc/doc
