[pkgsrc/trunk]: pkgsrc/mk /usr/bin/cpp on darwin is a wrapper script that for...

[danw <danw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bd10993049f
branches:  trunk
changeset: 474691:8bd10993049f
user:      danw <danw%pkgsrc.org@localhost>
date:      Tue May 04 00:11:23 2004 +0000

description:
/usr/bin/cpp on darwin is a wrapper script that forces the
-traditional flag; you need to use "gcc -E" to get sane behavior.
Override sys.mk's definition of CPP in defs.Darwin.mk, and don't
re-override CPP in gcc.mk if ${OPSYS} == Darwin.

diffstat:

 mk/compiler/gcc.mk |  6 +++---
 mk/defs.Darwin.mk  |  5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r add9b372522b -r 8bd10993049f mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Mon May 03 23:47:55 2004 +0000
+++ b/mk/compiler/gcc.mk        Tue May 04 00:11:23 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.62 2004/03/30 21:39:24 jlam Exp $
+# $NetBSD: gcc.mk,v 1.63 2004/05/04 00:11:23 danw Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=       defined
@@ -295,7 +295,7 @@
 PKG_CC=                ${_GCC_CC}
 CC=            ${PKG_CC:T}
 .endif
-.if exists(${_GCCBINDIR}/cpp)
+.if exists(${_GCCBINDIR}/cpp) && ${OPSYS} != "Darwin"
 _GCC_CPP=      ${_GCC_DIR}/bin/cpp
 _GCC_LINKS+=   _GCC_CPP
 PKG_CPP=       ${_GCC_CPP}
@@ -332,7 +332,7 @@
        else                                                            \
                ${ECHO} "gcc-${_GCC_REQD}";                             \
        fi
-       
+
 .  else
 CC_VERSION_STRING=     ${CC_VERSION}
 CC_VERSION=            gcc-${_GCC_REQD}
diff -r add9b372522b -r 8bd10993049f mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Mon May 03 23:47:55 2004 +0000
+++ b/mk/defs.Darwin.mk Tue May 04 00:11:23 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.72 2004/04/27 13:43:05 tv Exp $
+# $NetBSD: defs.Darwin.mk,v 1.73 2004/05/04 00:11:23 danw Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -10,6 +10,9 @@
 CHGRP?=                /usr/bin/chgrp
 CMP?=          /usr/bin/cmp
 CP?=           /bin/cp
+.if !defined(CPP) || ${CPP} == "cpp"
+CPP=           ${CC} -E ${CPP_PRECOMP_FLAGS}
+.endif
 CUT?=          /usr/bin/cut
 DATE?=         /bin/date
 DC?=           /usr/bin/dc