diff options
| author | tez <tez@pkgsrc.org> | 2010-05-12 20:57:46 +0000 |
|---|---|---|
| committer | tez <tez@pkgsrc.org> | 2010-05-12 20:57:46 +0000 |
| commit | 2716f5893d8d6a417260076e448d75d854bd9828 (patch) | |
| tree | 15140c463affeb2617b39cbbc1431044d4d0c7de /pkgtools | |
| parent | 19649654728d10f580231d939dab0235bbaa4dbe (diff) | |
| download | pkgsrc-2716f5893d8d6a417260076e448d75d854bd9828.tar.gz | |
In SunOS, use cpp rather than ${CC} -E, as gcc -E is broken.
If /usr/ucb/lib/cpp is in the path before gnu cpp this could break things
but that is not an expected situation. The only executable in /usr/ucb/lib
is cpp, so there is no other reason to add it to the path.
This should fix PR#42624
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/bootstrap-mk-files/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index 9bcea3448aa..582d5e5a338 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2010/01/15 22:00:36 abs Exp $ +# $NetBSD: Makefile,v 1.25 2010/05/12 20:57:46 tez Exp $ DISTNAME= bootstrap-mk-files-20090807 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk index 6b63aa62a1d..c3fea07f986 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk +++ b/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk @@ -1,4 +1,4 @@ -# $NetBSD: SunOS.sys.mk,v 1.2 2008/02/11 15:12:39 tnn Exp $ +# $NetBSD: SunOS.sys.mk,v 1.3 2010/05/12 20:57:46 tez Exp $ # NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp # @(#)sys.mk 8.2 (Berkeley) 3/21/94 @@ -40,7 +40,13 @@ OBJCFLAGS?= ${CFLAGS} COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} +# use cpp if using gcc, else use ${CC} -E as gcc -E is broken pr#42624 +# if /usr/ucb/lib/cpp is in the path before gnu cpp this could break things +.if !empty(CC:Mgcc) +CPP?= cpp +.else CPP?= ${CC} -E +.endif .if defined(NETBSD_COMPATIBLE) CPPFLAGS?= -I${BSDDIR}/include -D__EXTENSIONS__ -D_XPG4_2 -DSUNOS_5 HOST_CPPFLAGS?= ${CPPFLAGS} |