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,19 +9,20 @@
 # http://www.illumos.org/license/CDDL.
 #
 
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
 
 CFLAGS= -O2 -I../../../../include -I../../..
 CFLAGS += -DLOADER_ZFS_SUPPORT
 CPPFLAGS=
 
-all: machine x86 libi386.a
+all: libi386.a
 
 clean: clobber
 clobber:
         $(RM) machine x86 $(OBJS) libi386.a
 

@@ -103,10 +104,12 @@
 
 x86:
         $(RM) x86
         $(SYMLINK) ../../../x86/include x86
 
-libi386.a: machine $(OBJS)
+$(OBJS): machine x86
+
+libi386.a: $(OBJS)
         $(AR) $(ARFLAGS) $@ $(OBJS)
 
 %.o:    $(LIBZFS)/%.c
         $(COMPILE.c) -o $@ $<