Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Don't use -traditional-cpp if HAVE_GCC3.



details:   https://anonhg.NetBSD.org/src/rev/73f2611bd6cb
branches:  trunk
changeset: 532287:73f2611bd6cb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jun 04 21:14:59 2002 +0000

description:
Don't use -traditional-cpp if HAVE_GCC3.

diffstat:

 share/mk/bsd.dep.mk |  11 ++++++++---
 share/mk/sys.mk     |   6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 9f110881bcca -r 73f2611bd6cb share/mk/bsd.dep.mk
--- a/share/mk/bsd.dep.mk       Tue Jun 04 21:13:21 2002 +0000
+++ b/share/mk/bsd.dep.mk       Tue Jun 04 21:14:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.dep.mk,v 1.34 2001/11/28 04:38:29 tv Exp $
+#      $NetBSD: bsd.dep.mk,v 1.35 2002/06/04 21:22:54 thorpej Exp $
 
 ##### Basic targets
 .PHONY:                cleandepend
@@ -15,16 +15,21 @@
 # some of the rules involve .h sources, so remove them from mkdep line
 
 .if defined(SRCS)
+.if defined(HAVE_GCC3)
+__acpp_flags=
+.else
+__acpp_flags=  -traditional-cpp
+.endif
 .NOPATH:       .depend
 .depend: ${SRCS} ${DPSRCS}
        @rm -f .depend
        @files="${.ALLSRC:M*.s} ${.ALLSRC:M*.S}"; \
        if [ "$$files" != " " ]; then \
          echo ${MKDEP} -a ${MKDEPFLAGS} \
-           ${AFLAGS:M-[ID]*:Q} ${CPPFLAGS:Q} -traditional-cpp ${AINC:Q} \
+           ${AFLAGS:M-[ID]*:Q} ${CPPFLAGS:Q} ${__acpp_flags} ${AINC:Q} \
            $$files; \
          ${MKDEP} -a ${MKDEPFLAGS} \
-           ${AFLAGS:M-[ID]*} ${CPPFLAGS} -traditional-cpp ${AINC} $$files; \
+           ${AFLAGS:M-[ID]*} ${CPPFLAGS} ${__acpp_flags} ${AINC} $$files; \
        fi
        @files="${.ALLSRC:M*.c}"; \
        if [ "$$files" != "" ]; then \
diff -r 9f110881bcca -r 73f2611bd6cb share/mk/sys.mk
--- a/share/mk/sys.mk   Tue Jun 04 21:13:21 2002 +0000
+++ b/share/mk/sys.mk   Tue Jun 04 21:14:59 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sys.mk,v 1.67 2002/06/04 21:13:21 thorpej Exp $
+#      $NetBSD: sys.mk,v 1.68 2002/06/04 21:14:59 thorpej Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 
 unix?=         We run NetBSD.
@@ -16,7 +16,11 @@
 AFLAGS?=
 COMPILE.s?=    ${CC} ${AFLAGS} -c
 LINK.s?=       ${CC} ${AFLAGS} ${LDFLAGS}
+.if defined(HAVE_GCC3)
+COMPILE.S?=    ${CC} ${AFLAGS} ${CPPFLAGS} -c
+.else
 COMPILE.S?=    ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
+.endif
 LINK.S?=       ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=           cc



Home | Main Index | Thread Index | Old Index