Print this page
9852 enable ld(1) guidance and deflib assertions for the illumos build

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/spell/Makefile
          +++ new/usr/src/cmd/spell/Makefile
↓ open down ↓ 66 lines elided ↑ open up ↑
  67   67  
  68   68  ROOTBINF = $(BINF:%=$(ROOTBIN)/%)
  69   69  ROOTSPELLF = $(SPELLF:%=$(ROOTSPELLD)/%)
  70   70  ROOTVARADMF = $(VARADMF:%=$(ROOTVARADMD)/%)
  71   71  
  72   72  HASHFILEMODE = 0644
  73   73  $(ROOTSPELLD)/hstop $(ROOTSPELLD)/hlistb \
  74   74  $(ROOTSPELLD)/hlista := FILEMODE =      0644
  75   75  $(ROOTVARADMF) :=       FILEMODE =      0666
  76   76  
       77 +#
       78 +# The native versions of these share targets with the target ones. Because of
       79 +# that it is important that we override these variables. For example, LDLIBS
       80 +# will add in the default LDLIBS.cmd which means that we'll link against the
       81 +# wrong versions of libc.
       82 +#
  77   83  spellin1 hashmk1 := CC = $(NATIVECC)
  78   84  spellin1 hashmk1 := POST_PROCESS =
  79   85  spellin1 hashmk1 := CPPFLAGS =
  80      -spellin1 hashmk1 := LDFLAGS =
       86 +spellin1 hashmk1 := LDFLAGS = -Bdirect
       87 +spellin1 hashmk1 := NATIVE_LIBS = libc.so
       88 +spellin1 hashmk1 := LDLIBS =
  81   89  
  82   90  $(ROOTSPELLD)/% $(ROOTVARADMD)/% : %
  83   91          $(INS.file)
  84   92  
  85   93  .KEEP_STATE:
  86   94  
  87      -all:    $(PROG) $(TXTS)
       95 +all:    $(PROG) $(TXTS)
  88   96  
  89   97  spellprog:              $(SPELLPROGOBJ)
  90   98                          $(LINK.c) $(SPELLPROGOBJ) -o $@ $(LDLIBS)
  91   99                          $(POST_PROCESS)
  92  100  
  93  101  spellin spellin1:       $(SPELLINOBJ)
  94  102                          $(LINK.c) $(SPELLINOBJ) -o $@ $(LDLIBS)
  95  103                          $(POST_PROCESS)
  96  104  
  97  105  spellhist:
↓ open down ↓ 39 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX