d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rescue build using -j. The problem appears to be make not being able

Browse Source 
to find the source when the object was specified as <directory>/foo.o.

The fix makes the build go through a make objs before compiling the rest
of the crunchgen. This ensures that the dhclient bits are built in the
correct place where they are picked up for the final compile of rescue.

I'd like to thank dwhite@ and gad@ for helping me track down the problem.

Fast testing box provided by:	phk@ (thanks)
This commit is contained in:
gordon 2003-07-24 07:42:42 +00:00
parent ff7ebb21b7
commit 660b2e52a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rescue/rescue/Makefile
View File

@ -246,14 +246,15 @@ $(CONF): Makefile
.endfor
.ORDER: $(OUTPUTS) objs
$(OUTPUTS): $(CONF)
MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -q -m $(OUTMK) -c $(OUTC) \
$(CONF)
$(PROG): $(OUTPUTS)
$(PROG): $(OUTPUTS) objs
MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK)
objs:
objs: $(OUTMK)
MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) objs
# <sigh> Someone should replace the bin/csh and bin/sh build-tools with