NEX-5200 native tools must reliably use a native adjunct
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

          --- old/usr/src/tools/ctf/cvt/Makefile.com
          +++ new/usr/src/tools/ctf/cvt/Makefile.com

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  
  26   26  include ../../Makefile.ctf
  27   27  
  28   28  .KEEP_STATE:
  29   29  .PARALLEL:
  30   30  
  31   31  PROG=ctfconvert ctfmerge
  32   32  
  33   33  GENSRCS= \
  34   34          alist.c \
  35   35          barrier.c \
  36   36          ctf.c \
  37   37          fifo.c \
  38   38          hash.c \
  39   39          iidesc.c \
  40   40          input.c \
  41   41          list.c \
  42   42          memory.c \
  43   43          merge.c \
  44   44          output.c \
  45   45          stack.c \
  46   46          strtab.c \
  47   47          symbol.c \
  48   48          tdata.c \
  49   49          traverse.c \
  50   50          util.c
  51   51  
  52   52  CVTSRCS=$(GENSRCS) \
  53   53          ctfconvert.c \
  54   54          dwarf.c \
  55   55          stabs.c \
  56   56          fixup_tdescs.c \
  57   57          st_parse.c
  58   58  CVTOBJS=$(CVTSRCS:%.c=%.o)
  59   59  CVTLINTFILES = $(CVTSRCS:%.c=%.ln)
  60   60  
  61   61  MRGSRCS=$(GENSRCS) \
  62   62          ctfmerge.c
  63   63  MRGOBJS=$(MRGSRCS:%.c=%.o)
  64   64  MRGLINTFILES = $(MRGSRCS:%.c=%.ln)
  65   65  

  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  CSTD            = $(CSTD_GNU99)
  87   87  
  88   88  ctfconvert      := LDFLAGS += $(DWARFLDFLAGS)
  89   89  
  90   90  dwarf.o dwarf.ln        := CPPFLAGS += $(DWARFCPPFLAGS)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX