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/zfs/Makefile.com
          +++ new/usr/src/boot/sys/boot/zfs/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  LIB=            zfsboot
  19   20  
  20      -all: machine x86 libzfsboot.a
       21 +all: libzfsboot.a
       22 +
  21   23  clean: clobber
  22   24  
  23   25  clobber:
  24   26          $(RM) machine x86 $(OBJS) libzfsboot.a
  25   27  
  26   28  CC=     $(GCC_ROOT)/bin/gcc
  27   29  CPPFLAGS=
  28   30  
  29   31  SRCS +=         ../zfs.c ../gzip.c
  30   32  OBJS +=         zfs.o gzip.o
↓ open down ↓ 10 lines elided ↑ open up ↑
  41   43  
  42   44  CLEANFILES +=    machine x86
  43   45  
  44   46  machine:
  45   47          $(RM) machine
  46   48          $(SYMLINK) ../../../$(MACHINE)/include machine
  47   49  
  48   50  x86:
  49   51          $(RM) x86
  50   52          $(SYMLINK) ../../../x86/include x86
       53 +
       54 +$(OBJS): machine x86
  51   55  
  52   56  libzfsboot.a: $(OBJS)
  53   57          $(AR) $(ARFLAGS) $@ $(OBJS)
  54   58  
  55   59  %.o:    ../%.c
  56   60          $(COMPILE.c) -o $@ $<
  57   61  
  58   62  zfs.o: ../zfsimpl.c
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX