Print this page
native tools must reliably use a native adjunct, even if that's inconvenient
While it is perhaps convenient for native tools to use updated versions
of certain things like libxml it is imperative that those versions are
_also_ build for the build machine.  Thus they need to be in the native
adjunct (even if that native adjunct is thus not /).
Fix the native adjunct to be rooted similarly to the adjunct proto (that
is, at /), and fix SMF to use it correctly

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libscf/Makefile.com
          +++ new/usr/src/lib/libscf/Makefile.com
↓ open down ↓ 62 lines elided ↑ open up ↑
  63   63  CERRWARN +=     -_gcc=-Wno-uninitialized
  64   64  
  65   65  #
  66   66  # For native builds, we compile and link against the native version
  67   67  # of libuutil.
  68   68  #
  69   69  LIBUUTIL =      $(SRC)/lib/libuutil
  70   70  MY_NATIVE_CPPFLAGS =\
  71   71                  -DNATIVE_BUILD $(DTEXTDOM) \
  72   72                  -I../inc -I$(COMDIR) -I$(LIBUUTIL)/common -I$(ROOTHDRDIR)
  73      -MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native -luutil -lc -lgen \
  74      -                   -lnsl -lnvpair
       73 +MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native \
       74 +                   -L$(NATIVE_ADJUNCT)/usr/lib -R$(NATIVE_ADJUNCT)/usr/lib \
       75 +                   -luutil -lc -lgen -lnsl -lnvpair
  75   76  MY_NATIVE_LDLIBS_i386 = -lsmbios
  76   77  MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH))
  77   78  
  78   79  .KEEP_STATE:
  79   80  
  80   81  all:
  81   82  
  82   83  lint: lintcheck
  83   84  
  84   85  include ../../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX