diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2018-01-27 02:06:38 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2018-02-03 17:48:41 +0000 |
| commit | ff074caab09347cf7a3028cad320325b14d826ce (patch) | |
| tree | b258315e40100a08c0a09bd1a2ebd1d7214d0a52 /usr/src | |
| parent | ebdebab4f6bda8cc25ecdb04439f077404f91768 (diff) | |
| download | illumos-joyent-ff074caab09347cf7a3028cad320325b14d826ce.tar.gz | |
9006 parallel loader builds fail sporadically
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/sys/boot/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/i386/Makefile | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/usr/src/boot/sys/boot/Makefile b/usr/src/boot/sys/boot/Makefile index 0493409f65..7f25b8f1ee 100644 --- a/usr/src/boot/sys/boot/Makefile +++ b/usr/src/boot/sys/boot/Makefile @@ -27,7 +27,15 @@ install := TARGET = install all clean clobber: $(SUBDIRS) -install: all $(INSTDIRS) +# +# The directories in INSTDIRS depend implicitly on SUBDIRS being built already. +# We use .WAIT instead of explicit dependencies because we only want to make +# the "install" target in INSTDIRS, not in SUBDIRS. +# +# If adding SUBDIRS which are not dependencies of INSTDIRS, "install: all" +# rules should be added to the Makefiles in those directories. +# +install: all .WAIT $(INSTDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET) diff --git a/usr/src/boot/sys/boot/i386/Makefile b/usr/src/boot/sys/boot/i386/Makefile index 305a816aa0..46db89b56e 100644 --- a/usr/src/boot/sys/boot/i386/Makefile +++ b/usr/src/boot/sys/boot/i386/Makefile @@ -29,9 +29,11 @@ clobber:= TARGET= clobber .KEEP_STATE: +pxeldr: loader + all clean clobber: $(SUBDIRS) -install: all $(INSTDIRS) +install: all .WAIT $(INSTDIRS) FRC: |