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 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
 
 CC=     $(GCC_ROOT)/bin/gcc

@@ -64,11 +65,12 @@
 LDSCRIPT=       ./../loader/arch/${MACHINE}/ldscript.${MACHINE}
 LDFLAGS=        -nostdlib --eh-frame-hdr -znocombreloc
 LDFLAGS +=      -shared --hash-style=both --enable-new-dtags
 LDFLAGS +=      -T${LDSCRIPT} -Bsymbolic
 
-all: machine x86 boot1.efi
+all: boot1.efi
+
 install: all $(ROOTBOOTFILES)
 
 #
 # Add libstand for the runtime functions used by the compiler - for example
 # __aeabi_* (arm) or __divdi3 (i386).

@@ -108,10 +110,12 @@
 
 x86:
         $(RM) x86
         $(SYMLINK) ./../../../x86/include x86
 
+$(OBJS): machine x86
+
 clean clobber:
         $(RM) $(CLEANFILES) $(OBJS)
 
 %.o:    ../loader/arch/${MACHINE}/%.S
         $(COMPILE.S) $<