diff options
| author | joerg <joerg> | 2006-05-31 09:47:01 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-05-31 09:47:01 +0000 |
| commit | 611a1e1e78b990f022b9101acdd23a612b3ea4bb (patch) | |
| tree | a05ffb2044853739e6410899f2de692b608fe3e8 | |
| parent | 367c5a7f6865f2980b0022df0a44f1f839c93d96 (diff) | |
| download | pkgsrc-611a1e1e78b990f022b9101acdd23a612b3ea4bb.tar.gz | |
Fix bootstrap on platforms with incompatible /usr/share/mk/sys.mk
by always forcing our internal search path when invocing bmake.boot.
This does not affect the generated binary and is the reason why this
goes directly into the tree.
| -rw-r--r-- | devel/bmake/files/makefile.boot.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/bmake/files/makefile.boot.in b/devel/bmake/files/makefile.boot.in index 6fdbb4d3d65..8d7d78e7c95 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.2 2005/11/10 00:09:34 reed Exp $ +# $Id: makefile.boot.in,v 1.3 2006/05/31 09:47:01 joerg Exp $ # # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture @@ -13,14 +13,14 @@ MKDEP=$(srcdir)/mkdeps.sh -n -i/usr/include MKDEP_OPTS=-A MK=${prefix}/share/mk MKSRC=@mksrc@ -DEFAULT_MAKESYSPATH=/usr/share/mk:/usr/local/share/mk:/opt/share/mk +DEFAULT_MAKESYSPATH=@default_sys_path@ 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 \ parse.o str.o suff.o targ.o trace.o var.o util.o getopt.o sigcompat.o @LIBOBJS@ -BMAKE_ENV= CC="$(CC)" LIBC= MAKEFLAGS= MAKESYSPATH=`pwd`/mk:${MKSRC}:${MK}:${DEFAULT_MAKESYSPATH} +BMAKE_ENV= CC="$(CC)" LIBC= MAKEFLAGS= MAKESYSPATH=${DEFAULT_MAKESYSPATH} bootstrap: bmake.boot .mk.done ${BMAKE_ENV} ./bmake.boot -f Makefile |