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.
This commit is contained in:
parent
c46f7b9c6f
commit
60c3f10368
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=140508
@ -267,10 +267,11 @@ $(CONF): Makefile
|
|||||||
.endfor
|
.endfor
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
# XXX Make sure we don't pass -P to crunchgen(1).
|
||||||
|
.MAKEFLAGS:= ${.MAKEFLAGS:N-P}
|
||||||
.ORDER: $(OUTPUTS) objs
|
.ORDER: $(OUTPUTS) objs
|
||||||
$(OUTPUTS): $(CONF)
|
$(OUTPUTS): $(CONF)
|
||||||
MAKEFLAGS= MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \
|
MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \
|
||||||
-c $(OUTC) $(CONF)
|
-c $(OUTC) $(CONF)
|
||||||
|
|
||||||
$(PROG): $(OUTPUTS) objs
|
$(PROG): $(OUTPUTS) objs
|
||||||
|
Loading…
Reference in New Issue
Block a user