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/svc/svccfg/Makefile
          +++ new/usr/src/cmd/svc/svccfg/Makefile
↓ open down ↓ 39 lines elided ↑ open up ↑
  40   40                  manifest_hash.ln
  41   41  
  42   42  MYOBJS =        $(SRCS:%.c=%.o) \
  43   43                  svccfg_grammar.o \
  44   44                  svccfg_lex.o \
  45   45                  manifest_find.o \
  46   46                  manifest_hash.o \
  47   47                  notify_params.o
  48   48  OBJS =          $(MYOBJS)
  49   49  
  50      -POFILES =       $(SRCS:%.c=%.po) \
       50 +POFILES =       $(SRCS:%.c=%.po) \
  51   51                  svccfg_grammar.po \
  52   52                  svccfg_lex.po \
  53   53                  ../common/manifest_find.po \
  54   54                  ../common/manifest_hash.po
  55   55  
  56   56  include ../../Makefile.cmd
  57   57  include ../../Makefile.ctf
  58   58  
  59   59  POFILE =        $(PROG)_all.po
  60   60  
↓ open down ↓ 21 lines elided ↑ open up ↑
  82   82  CERRWARN +=     -_gcc=-Wno-parentheses
  83   83  
  84   84  LFLAGS = -t
  85   85  YFLAGS = -d
  86   86  
  87   87  CLOBBERFILES += svccfg_lex.c svccfg_grammar.c svccfg_grammar.h \
  88   88      $(MYPROG:%=%-native)
  89   89  
  90   90  SVCCFG_EXTRA_LIBS = -lxml2 -lscf -ll -luutil -lumem -lmd5 -lnvpair
  91   91  $(NOT_NATIVE)SVCCFG_EXTRA_LIBS += -ltecla
       92 +$(NOT_NATIVE)ADJUNCT_LIBS += libxml2.so
  92   93  
  93   94  LIBSCF          = $(SRC)/lib/libscf
  94   95  LIBTECLA        = $(SRC)/lib/libtecla           # just for the header
  95   96  LIBUUTIL        = $(SRC)/lib/libuutil
  96   97  
  97   98  debug := COPTFLAG = -g
  98   99  
  99  100  lint := LINTFLAGS = -mux
 100  101  lint := SVCCFG_EXTRA_LIBS = -lscf -ll -luutil -lumem -lmd5 -lnvpair
 101  102  
↓ open down ↓ 1 lines elided ↑ open up ↑
 103  104  
 104  105  $(NATIVE_BUILD)CC =     $(NATIVECC)
 105  106  $(NATIVE_BUILD)LD =     $(NATIVELD)
 106  107  $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
 107  108  $(NATIVE_BUILD)CPPFLAGS = \
 108  109          -DNATIVE_BUILD \
 109  110          $(MYCPPFLAGS) \
 110  111          -I$(LIBSCF)/inc \
 111  112          -I$(LIBTECLA) \
 112  113          -I$(LIBUUTIL)/common
 113      -$(NATIVE_BUILD)LDFLAGS =
      114 +$(NATIVE_BUILD)LDFLAGS =        -Bdirect
      115 +$(NATIVE_BUILD)NATIVE_LIBS = libxml2.so libl.so libumem.so libmd5.so libnvpair.so libc.so
 114  116  $(NATIVE_BUILD)LDLIBS = \
 115  117          -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \
 116  118          -L$(LIBSCF)/native -R $(LIBSCF)/native \
 117  119          -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
 118  120          $(SVCCFG_EXTRA_LIBS)
 119  121  
 120  122  svccfg_lex.o svccfg_grammar.o := CCVERBOSE =
 121  123  
 122  124  svccfg_help.po := XGETFLAGS =   -a
 123  125  
↓ open down ↓ 56 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX