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>

Split Close
Expand all
Collapse all
          --- old/usr/src/boot/sys/boot/libstand/Makefile.com
          +++ new/usr/src/boot/sys/boot/libstand/Makefile.com
↓ open down ↓ 3 lines elided ↑ open up ↑
   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 2016 Toomas Soome <tsoome@me.com>
       14 +# Copyright 2016 RackTop Systems.
  14   15  #
  15   16  
  16   17  include $(SRC)/Makefile.master
  17   18  
  18   19  AS=     $(GNU_ROOT)/bin/gas
  19   20  LD=     $(GNU_ROOT)/bin/gld
  20   21  CC=     $(GCC_ROOT)/bin/gcc
  21   22  
  22   23  LIBRARY=        libstand.a
  23   24  
  24      -all install: machine x86 $(LIBRARY)
       25 +all install: $(LIBRARY)
  25   26  
  26   27  LIB_BASE=       $(SRC)/boot/lib
  27   28  LIBSTAND_SRC=   $(LIB_BASE)/libstand
  28   29  
  29   30  CPPFLAGS =      -nostdinc -I../../../../include -I${LIBSTAND_SRC} -I../../..
  30   31  CPPFLAGS +=     -I../../../sys -I.
  31   32  
  32   33  CFLAGS =        -O2 -ffreestanding -Wformat
  33   34  CFLAGS +=       -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
  34   35  CFLAGS +=       -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int \
↓ open down ↓ 11 lines elided ↑ open up ↑
  46   47  clobber:
  47   48          $(RM) $(CLEANFILES) $(OBJS) machine x86 libstand.a
  48   49  
  49   50  machine:
  50   51          $(RM) machine
  51   52          $(SYMLINK) ../../../$(MACHINE)/include machine
  52   53  
  53   54  x86:
  54   55          $(RM) x86
  55   56          $(SYMLINK) ../../../x86/include x86
       57 +
       58 +$(OBJS): machine x86
  56   59  
  57   60  %.o:    $(LIBSTAND_SRC)/%.c
  58   61          $(COMPILE.c) $<
  59   62  
  60   63  %.o:    $(LIB_BASE)/libc/net/%.c
  61   64          $(COMPILE.c) $<
  62   65  
  63   66  %.o:    $(LIB_BASE)/libc/string/%.c
  64   67          $(COMPILE.c) $<
  65   68  
  66   69  %.o:    $(LIB_BASE)/libc/uuid/%.c
  67   70          $(COMPILE.c) $<
  68   71  
  69   72  %.o:    $(LIB_BASE)/libz/%.c
  70   73          $(COMPILE.c) $<
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX