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>

          --- old/usr/src/boot/sys/boot/efi/libefi/Makefile
          +++ new/usr/src/boot/sys/boot/efi/libefi/Makefile

   1    1  #
   2    2  # This file and its contents are supplied under the terms of the
   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.

   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13   13  # Copyright 2015 Toomas Soome <tsoome@me.com>
       14 +# Copyright 2016 RackTop Systems.
  14   15  #
  15   16  
  16   17  include $(SRC)/Makefile.master
  17   18  
  18   19  CC=     $(GCC_ROOT)/bin/gcc
  19   20  
  20   21  LIB=    efi
  21   22  
  22      -all:    machine x86 lib$(LIB).a
       23 +all:    lib$(LIB).a
       24 +
  23   25  install:
  24   26  
  25   27  SRCS=   delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
  26   28          libefi.c time.c
  27   29  
  28   30  OBJS=   $(SRCS:%.c=%.o)
  29   31  
  30   32  CPPFLAGS= -DTERM_EMU
  31   33  CFLAGS = -O2
  32   34  

  33   35  #.if ${MACHINE_CPUARCH} == "aarch64"
  34   36  #CFLAGS+=       -msoft-float -mgeneral-regs-only
  35   37  #.endif
  36   38  #.if ${MACHINE_ARCH} == "amd64"
  37   39  CFLAGS += -fPIC
  38   40  #.endif
  39   41  
  40   42  CFLAGS += -nostdinc -I. -I../../../../include -I../../..
  41   43  CFLAGS += -I../include
  42   44  CFLAGS += -I../include/${MACH64}
  43   45  CFLAGS += -I../../../../lib/libstand
  44   46  
  45   47  # Pick up the bootstrap header for some interface items
  46   48  CFLAGS += -I../../common
  47   49  
  48   50  # Handle FreeBSD specific %b and %D printf format specifiers
  49   51  # CFLAGS+= ${FORMAT_EXTENSIONS}
  50   52  # CFLAGS += -D__printf__=__freebsd_kprintf__
  51   53  CFLAGS+= -DTERM_EMU
  52   54  
  53   55  include ../Makefile.inc
  54   56  
  55   57  lib$(LIB).a: $(SRCS) $(OBJS)
  56   58          $(AR) $(ARFLAGS) $@ $(OBJS)
  57   59  
  58   60  clean: clobber

  59   61  clobber:
  60   62          $(RM) $(CLEANFILES) $(OBJS) machine x86 lib$(LIB).a
  61   63  
  62   64  machine:
  63   65          $(RM) machine
  64   66          $(SYMLINK) ../../../amd64/include machine
  65   67  
  66   68  x86:
  67   69          $(RM) x86
  68   70          $(SYMLINK) ../../../x86/include x86
       71 +
       72 +$(OBJS): machine x86
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX