diff options
| author | schmonz <schmonz> | 2007-05-23 04:21:05 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2007-05-23 04:21:05 +0000 |
| commit | 9f612f9761b0b10fab4a5186cfec37a54aa3b431 (patch) | |
| tree | 8129176abea778a1b1ceba0e33411a1c4ba84058 | |
| parent | 80161ffabdfd7a6e5ab1cc01e8ea79d6e2b97574 (diff) | |
| download | pkgsrc-9f612f9761b0b10fab4a5186cfec37a54aa3b431.tar.gz | |
Respect CFLAGS. Fixes Universal build on OS X.
| -rw-r--r-- | devel/bmake/files/Makefile.in | 5 | ||||
| -rw-r--r-- | devel/bmake/files/lst.lib/makefile.boot.in | 5 | ||||
| -rw-r--r-- | devel/bmake/files/makefile.boot.in | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/devel/bmake/files/Makefile.in b/devel/bmake/files/Makefile.in index bddcdffe0e5..22e41afa2da 100644 --- a/devel/bmake/files/Makefile.in +++ b/devel/bmake/files/Makefile.in @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.in,v 1.2 2005/11/10 00:09:34 reed Exp $ +# $NetBSD: Makefile.in,v 1.3 2007/05/23 04:21:05 schmonz Exp $ # @(#)Makefile 5.2 (Berkeley) 12/28/90 -# $Id: Makefile.in,v 1.2 2005/11/10 00:09:34 reed Exp $ +# $Id: Makefile.in,v 1.3 2007/05/23 04:21:05 schmonz Exp $ PROG= bmake SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \ @@ -29,6 +29,7 @@ MAKE_VERSION:= bmake-${BMAKE_VERSION} build-${BUILD_DATE} MACHINE=@machine@ MACHINE_ARCH=@machine_arch@ +CFLAGS?= @CFLAGS@ CFLAGS+= -D_PATH_DEFSYSPATH=\"@default_sys_path@\" CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} -DMAKE_NATIVE CFLAGS+= ${CFLAGS_${.TARGET:T}} diff --git a/devel/bmake/files/lst.lib/makefile.boot.in b/devel/bmake/files/lst.lib/makefile.boot.in index 8d55f920f00..b3ca4647b10 100644 --- a/devel/bmake/files/lst.lib/makefile.boot.in +++ b/devel/bmake/files/lst.lib/makefile.boot.in @@ -1,5 +1,5 @@ # RCSid: -# $Id: makefile.boot.in,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $Id: makefile.boot.in,v 1.2 2007/05/23 04:21:05 schmonz Exp $ srcdir=@srcdir@ VPATH=.:$(srcdir) @@ -10,7 +10,8 @@ OBJ=lstAppend.o lstDupl.o lstInit.o lstOpen.o lstAtEnd.o lstEnQueue.o \ lstDatum.o lstForEach.o lstMember.o lstSucc.o lstDeQueue.o \ lstForEachFrom.o lstDestroy.o lstNext.o -CFLAGS=-I.. +CFLAGS=@CFLAGS@ +CFLAGS+=-I.. all: ${OBJ} depend: diff --git a/devel/bmake/files/makefile.boot.in b/devel/bmake/files/makefile.boot.in index 8d7d78e7c95..981bbf6e7bf 100644 --- a/devel/bmake/files/makefile.boot.in +++ b/devel/bmake/files/makefile.boot.in @@ -1,5 +1,5 @@ # RCSid: -# $Id: makefile.boot.in,v 1.3 2006/05/31 09:47:01 joerg Exp $ +# $Id: makefile.boot.in,v 1.4 2007/05/23 04:21:05 schmonz Exp $ # # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture @@ -14,7 +14,8 @@ MKDEP_OPTS=-A MK=${prefix}/share/mk MKSRC=@mksrc@ DEFAULT_MAKESYSPATH=@default_sys_path@ -CFLAGS=-I. -I$(srcdir) @DEFS@ @CPPFLAGS@ ${XDEFS} -D_PATH_DEFSYSPATH=\"@default_sys_path@\" +CFLAGS=@CFLAGS@ +CFLAGS+=-I. -I$(srcdir) @DEFS@ @CPPFLAGS@ ${XDEFS} -D_PATH_DEFSYSPATH=\"@default_sys_path@\" MDEFS="-D@force_machine@MACHINE=\"@machine@\"" "-DMACHINE_ARCH=\"@machine_arch@\"" OBJ=arch.o buf.o compat.o cond.o dir.o for.o hash.o job.o main.o make.o \ |