11461 should use a native link-editor during the build
11463 SUNWonld has passed its use-by date
11464 cmd/sgs/tools should contain tools, not common code
11465 sgsmsg should be built with the rest of the build tools

          --- old/usr/src/cmd/sgs/ldd/Makefile.com
          +++ new/usr/src/cmd/sgs/ldd/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  #
  23   23  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  # Copyright (c) 2018, Joyent, Inc.

  27   27  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  28   28  #
  29   29  
  30   30  PROG=           ldd
  31   31  
  32   32  include         $(SRC)/cmd/Makefile.cmd
  33   33  include         $(SRC)/cmd/sgs/Makefile.com
  34   34  
  35   35  COMOBJ=         ldd.o
  36   36  BLTOBJ=         msg.o
  37      -TOOLSOBJ=       alist.o
       37 +SGSCOMMONOBJ=   alist.o
  38   38  
  39      -OBJS=           $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
       39 +OBJS=           $(BLTOBJ) $(COMOBJ) $(SGSCOMMONOBJ)
  40   40  
  41   41  MAPFILE=        $(MAPFILE.NGB)
  42   42  MAPOPTS=        $(MAPFILE:%=-M%)
  43   43  
  44   44  CPPFLAGS +=     -I. -I../../include -I../../include/$(MACH) \
  45      -                -I$(SRCBASE)/uts/$(ARCH)/sys \
       45 +                -I$(SRC)/uts/$(ARCH)/sys \
  46   46                  $(CPPFLAGS.master)
  47   47  LLDFLAGS =      '-R$$ORIGIN/../../lib'
  48   48  LLDFLAGS64 =    '-R$$ORIGIN/../../../lib/$(MACH64)'
  49      -LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
  50      -LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB)
       49 +LDFLAGS +=      $(VERSREF) $(MAPOPTS) $(LLDFLAGS)
       50 +LDLIBS +=       $(CONVLIBDIR) -lconv -lelf
  51   51  
  52   52  SMOFF += or_vs_and
  53   53  
  54   54  BLTDEFS=        msg.h
  55   55  BLTDATA=        msg.c
  56   56  BLTMESG=        $(SGSMSGDIR)/ldd
  57   57  
  58   58  BLTFILES=       $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  59   59  
  60   60  SGSMSGCOM=      ../common/ldd.msg
  61   61  SGSMSGTARG=     $(SGSMSGCOM)
  62   62  SGSMSGALL=      $(SGSMSGCOM)
  63   63  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n ldd_msg
  64   64  
  65   65  SRCS=           $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \
  66      -                $(TOOLSOBJ:%.o=$(SGSTOOLS)/common/%.c)
       66 +                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c)
  67   67  
  68   68  CLEANFILES +=   $(BLTFILES)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX