Print this page
12323 configd NATIVE_LIBS setting reversed meaning

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/svc/configd/Makefile
          +++ new/usr/src/cmd/svc/configd/Makefile
↓ open down ↓ 70 lines elided ↑ open up ↑
  71   71  
  72   72  CLOBBERFILES += $(MYPROG:%=%-native)
  73   73  
  74   74  LIBUUTIL        = $(SRC)/lib/libuutil
  75   75  LIBSCF          = $(SRC)/lib/libscf
  76   76  
  77   77  SCRIPTFILE      = restore_repository
  78   78  ROOTSCRIPTFILE  = $(ROOTCMDDIR)/$(SCRIPTFILE)
  79   79  
  80   80  #
  81      -# Native variant (used in ../seed). We only need to set NATIVE_LIBS if
  82      -# $(ADJUNCT_PROTO) is pointing outside of /usr/lib.
       81 +# Native variant (used in ../seed).
  83   82  #
  84      -$(NO_ADJUNCT_PROTO)NATIVE_LIBS += libumem.so libc.so
       83 +$(NATIVE_BUILD)NATIVE_LIBS += libumem.so libc.so
  85   84  $(NATIVE_BUILD)CC =     $(NATIVECC)
  86   85  $(NATIVE_BUILD)LD =     $(NATIVELD)
  87   86  $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
  88   87  $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
  89   88  $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
  90   89  $(NATIVE_BUILD)LDFLAGS = $(BDIRECT)
  91   90  $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
  92   91                          -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
  93   92  
  94   93  DIRMODE = 0755
↓ open down ↓ 43 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX