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/tools/ctf/cvt/Makefile.com
          +++ new/usr/src/tools/ctf/cvt/Makefile.com
↓ open down ↓ 65 lines elided ↑ open up ↑
  66   66  SRCS=$(CVTSRCS) $(MRGSRCS) $(CMPSRCS)
  67   67  OBJS=$(SRCS:%.c=%.o)
  68   68  LINTFILES=$(SRCS:%.c=%.ln)
  69   69  
  70   70  DWARFLDFLAGS    = \
  71   71          -L$(ROOTONBLDLIBMACH) \
  72   72          '-R$$ORIGIN/../../lib/$(MACH)' \
  73   73          -ldwarf
  74   74  DWARFCPPFLAGS   = -I../../dwarf/common
  75   75  
  76      -LDFLAGS         += -L$(NATIVE_ADJUNCT)/lib
       76 +LDFLAGS         += -L$(NATIVE_ADJUNCT)/usr/lib
  77   77  LDLIBS          += -lz -lelf
  78   78  CPPFLAGS        += -D_REENTRANT
  79   79  CFLAGS          += $(CTF_FLAGS)
  80   80  LINTFLAGS       += -mnux
  81   81  
  82   82  CERRWARN        += -_gcc=-Wno-unused
  83   83  CERRWARN        += -_gcc=-Wno-uninitialized
  84   84  CERRWARN        += -_gcc=-Wno-switch
  85   85  
  86   86  C99MODE         = $(C99_ENABLE)
  87   87  
  88   88  ctfconvert      := LDFLAGS += $(DWARFLDFLAGS)
  89   89  
  90   90  dwarf.o dwarf.ln        := CPPFLAGS += $(DWARFCPPFLAGS)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX