diff options
| author | ru <ru@FreeBSD.org> | 2005-01-20 10:43:43 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2005-01-20 10:43:43 +0000 |
| commit | 4f4d01c76f55e3e959b012189d867beaf3c0f0e3 (patch) | |
| tree | 357f51cc1fd2b9d9a7d4c1f40b9e273cb68ab59e /rescue | |
| parent | d4d1359bb9fd57ebc77a94747609c810abfedad9 (diff) | |
| download | FreeBSD-src-4f4d01c76f55e3e959b012189d867beaf3c0f0e3.zip FreeBSD-src-4f4d01c76f55e3e959b012189d867beaf3c0f0e3.tar.gz | |
Ignoring MAKEFLAGS in rev. 1.15 was a very bad idea. This causes
wrong share/mk files to be used, which can be fatal with upgrades
or downgrades, e.g., when building RELENG_5 on HEAD.
Reported by: glebius
For now, just exclude -P from MAKEFLAGS when running crunchgen(1).
(Note that it will still break when run with certain -d options.)
The real solution is to fix make(1) to not print stuff on stdout
when it's not supposed to, e.g., through the -P and -dX options,
and to fix crunchgen(1) to not redirect stderr to stdout when
running make(1). Once this is implemented, this hack can go.
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index a493ef2..636b807 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -267,10 +267,11 @@ $(CONF): Makefile .endfor .endfor - +# XXX Make sure we don't pass -P to crunchgen(1). +.MAKEFLAGS:= ${.MAKEFLAGS:N-P} .ORDER: $(OUTPUTS) objs $(OUTPUTS): $(CONF) - MAKEFLAGS= MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \ + MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \ -c $(OUTC) $(CONF) $(PROG): $(OUTPUTS) objs |
