Print this page
7438 intermittent build failures from the new boot loader
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>

@@ -9,10 +9,11 @@
 # http://www.illumos.org/license/CDDL.
 #
 
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
 
 CFLAGS= -O2

@@ -40,11 +41,11 @@
 ROOTBOOTFILES=$(FILES:%=$(ROOT_BOOT)/%)
 ROOTBOOTFORTH=$(FORTH:%=$(ROOT_BOOT_FORTH)/%)
 ROOTBOOTDEFAULTS=$(DEFFILES:%=$(ROOT_BOOT_DEFAULTS)/%)
 FILEMODE=0444
 
-all: machine x86 ${LOADER} loader.help
+all: ${LOADER} loader.help
 
 install: all $(ROOTBOOTLOADER)
 
 PROG=           ${LOADER}.sym
 INTERNALPROG=

@@ -143,10 +144,12 @@
         $(RM) x86
         $(SYMLINK) ../../../x86/include x86
 
 OBJS=           $(SRCS:%.c=%.o)
 
+${OBJS}: machine x86
+
 ${PROG}: ${OBJS} $(LDADD)
         $(LD) $(LDFLAGS) -o $@ $(BTXCRT) $(OBJS) $(LDADD)
 
 clean: clobber
 clobber: