diff options
| author | jschauma <jschauma@pkgsrc.org> | 2006-11-11 18:24:52 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2006-11-11 18:24:52 +0000 |
| commit | 4b05d984b21379c03cd2d67b74eb69381232abae (patch) | |
| tree | 534f8c45aa00297469b59263d75cdd7db341a39e | |
| parent | d5140de49dff4678f239fb315d6e18f3891b33ae (diff) | |
| download | pkgsrc-4b05d984b21379c03cd2d67b74eb69381232abae.tar.gz | |
Address PR pkg/34966 as suggested by Oliver Gould and apply the same
logic to all platforms:
Some packages (such as math/gap) create wrappers based on the name of
the compiler, so ${CC} should not contain any flags. Move flags into
CFLAGS.
4 files changed, 15 insertions, 15 deletions
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index cc106456fad..a339b66d191 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2006/08/24 17:49:52 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2006/11/11 18:24:52 jschauma Exp $ -DISTNAME= bootstrap-mk-files-20060824 +DISTNAME= bootstrap-mk-files-20061111 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk index 959f9bc2797..e7092b03e8f 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk +++ b/pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $ +# $NetBSD: Darwin.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $ # @(#)sys.mk 8.2 (Berkeley) 3/21/94 unix= We run UNIX. @@ -21,12 +21,12 @@ COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS} .if exists(/usr/bin/gcc) -CC?= gcc -pipe +CC?= gcc .else -CC?= cc -pipe +CC?= cc .endif DBG?= -O2 -CFLAGS?= ${DBG} +CFLAGS?= -pipe ${DBG} COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} diff --git a/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk index d62fbdc617d..a8119f48503 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk +++ b/pkgtools/bootstrap-mk-files/files/mods/Interix.sys.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $ +# $NetBSD: Interix.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $ unix?= We run Unix OS!= uname -s @@ -20,11 +20,11 @@ COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS} # Unless told otherwise, assume GNU CC -CC?= gcc -D_ALL_SOURCE +CC?= gcc DBG?= -O -CFLAGS?= ${DBG} +CFLAGS?= -D_ALL_SOURCE ${DBG} COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} diff --git a/pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk index 308b306b479..43856c45bfa 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk +++ b/pkgtools/bootstrap-mk-files/files/mods/UnixWare.sys.mk @@ -1,4 +1,4 @@ -# $NetBSD: UnixWare.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $ +# $NetBSD: UnixWare.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $ # NetBSD: SunOS.sys.mk,v 1.1.1.1 2004/03/11 13:04:00 grant Exp # NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp # @(#)sys.mk 8.2 (Berkeley) 3/21/94 @@ -22,15 +22,15 @@ LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS} COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS} -# gcc on Unixware has no internal macro to identify the system -CC?= gcc -DUNIXWARE +CC?= gcc DBG?= -O2 -CFLAGS?= ${DBG} +# gcc on Unixware has no internal macro to identify the system +CFLAGS?= -DUNIXWARE ${DBG} COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -CXX?= g++ -DUNIXWARE -CXXFLAGS?= ${CFLAGS} +CXX?= g++ +CXXFLAGS?= -DUNIXWARE ${CFLAGS} COMPILE.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} |