diff options
| author | gordon <gordon@FreeBSD.org> | 2003-07-24 07:42:42 +0000 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2003-07-24 07:42:42 +0000 |
| commit | 660b2e52a158376e51f7a60e15d689f67b7ed702 (patch) | |
| tree | afb8063bae52cf000a7b3fd40b1538396da6420a /rescue | |
| parent | ff7ebb21b78e670173e40936db94922848426386 (diff) | |
| download | FreeBSD-src-660b2e52a158376e51f7a60e15d689f67b7ed702.zip FreeBSD-src-660b2e52a158376e51f7a60e15d689f67b7ed702.tar.gz | |
Fix rescue build using -j. The problem appears to be make not being able
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)
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 5f532d3..d12c35c 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -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 |
