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,21 +9,22 @@
 # http://www.illumos.org/license/CDDL.
 #
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
 
 AS=     $(GNU_ROOT)/bin/gas
 LD=     $(GNU_ROOT)/bin/gld
 CC=     $(GCC_ROOT)/bin/gcc
 
 LIBRARY=        libstand.a
 
-all install: machine x86 $(LIBRARY)
+all install: $(LIBRARY)
 
 LIB_BASE=       $(SRC)/boot/lib
 LIBSTAND_SRC=   $(LIB_BASE)/libstand
 
 CPPFLAGS =      -nostdinc -I../../../../include -I${LIBSTAND_SRC} -I../../..

@@ -52,10 +53,12 @@
 
 x86:
         $(RM) x86
         $(SYMLINK) ../../../x86/include x86
 
+$(OBJS): machine x86
+
 %.o:    $(LIBSTAND_SRC)/%.c
         $(COMPILE.c) $<
 
 %.o:    $(LIB_BASE)/libc/net/%.c
         $(COMPILE.c) $<