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/nm/amd64/Makefile
          +++ new/usr/src/cmd/sgs/nm/amd64/Makefile

   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 2010 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright (c) 2019, Joyent, Inc.
  26   26  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  27   27  #
  28   28  
  29   29  PROG=           nm
  30   30  
  31   31  ARFORMAT=       PORTAR
  32   32  
  33   33  include         ../../../Makefile.cmd

  34   34  include         ../../Makefile.com
  35   35  
  36   36  COMOBJS=        nm.o
  37   37  
  38   38  OBJS=           $(COMOBJS)
  39   39  
  40   40  SRCS=           $(COMOBJS:%.o=../common/%.c)
  41   41  
  42   42  LDFLAGS +=      '-R$$ORIGIN/../../../lib/$(MACH64)'
  43   43  INCLIST=        -I../../include -I../../include/i386 \
  44      -                -I$(SRCBASE)/uts/$(ARCH)/sys
       44 +                -I$(SRC)/uts/$(ARCH)/sys
  45   45  CPPFLAGS=       $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
  46   46  
  47      -LDLIBS +=       $(CONVLIBDIR64) $(CONV_LIB) $(ELFLIBDIR) -lelf
       47 +LDLIBS +=       $(CONVLIBDIR64) -lconv $(ELFLIBDIR) -lelf
  48   48  
  49   49  %.o:            ../common/%.c
  50   50                  $(COMPILE.c) $<
  51   51  
  52   52  $(ROOTCCSBIN64)/%: %
  53   53          $(INS.file)
  54   54  
  55   55  .KEEP_STATE:
  56   56  
  57   57  all:            $(PROG)

  58   58  
  59   59  $(PROG):        $(OBJS)
  60   60                  $(LINK.c) $(OBJS) -o $@ $(LDLIBS)
  61   61                  $(POST_PROCESS)
  62   62  
  63   63  package \
  64   64  install:        all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64)
  65   65  
  66   66  clean:
  67   67                  $(RM) $(OBJS) $(CLEANFILES)
  68   68  
  69   69  include         ../../Makefile.targ
  70   70  include         ../../../Makefile.targ
  71   71  include         ../../Makefile.sub.64

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX