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/elfedit/Makefile.com
          +++ new/usr/src/cmd/sgs/elfedit/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 2019 OmniOS Community Edition (OmniOSce) Association.
  27   27  #
  28   28  
  29   29  PROG=           elfedit
  30   30  
  31   31  include         $(SRC)/cmd/Makefile.cmd
  32   32  include         $(SRC)/cmd/sgs/Makefile.com
  33   33  
  34   34  COMOBJ =        elfedit.o sys.o util.o elfconst.o
  35   35  
  36   36  COMOBJ32 =      elfedit_machelf32.o util_machelf32.o

  37   37  
  38   38  COMOBJ64 =      elfedit_machelf64.o util_machelf64.o
  39   39  
  40   40  BLTOBJ =        msg.o
  41   41  
  42   42  OBJS=           $(BLTOBJ) $(COMOBJ) $(COMOBJ32) $(COMOBJ64)
  43   43  
  44   44  MAPFILE=        ../common/mapfile-vers
  45   45  
  46   46  CPPFLAGS=       -I. -I../common -I../../include -I../../include/$(MACH) \
  47      -                -I$(SRCBASE)/lib/libc/inc -I$(SRCBASE)/uts/$(ARCH)/sys \
       47 +                -I$(SRC)/lib/libc/inc -I$(SRC)/uts/$(ARCH)/sys \
  48   48                  $(CPPFLAGS.master) -I$(ELFCAP)
  49   49  LLDFLAGS =      $(VAR_ELFEDIT_LLDFLAGS)
  50   50  LLDFLAGS64 =    $(VAR_ELFEDIT_LLDFLAGS64)
  51      -LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) -M$(MAPFILE) $(LLDFLAGS)
  52      -LDLIBS +=       $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \
  53      -                    $(CONVLIBDIR) $(CONV_LIB) -ltecla
       51 +LDFLAGS +=      $(VERSREF) -M$(MAPFILE) $(LLDFLAGS)
       52 +LDLIBS +=       $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \
       53 +                    $(CONVLIBDIR) -lconv -ltecla
  54   54  
  55   55  CERRWARN +=     -_gcc=-Wno-switch
  56   56  CERRWARN +=     -_gcc=-Wno-uninitialized
  57   57  
  58   58  BLTDEFS =       msg.h
  59   59  BLTDATA =       msg.c
  60   60  BLTMESG =       $(SGSMSGDIR)/elfedit
  61   61  
  62   62  BLTFILES =      $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  63   63  
  64   64  SGSMSGCOM =     ../common/elfedit.msg
  65   65  SGSMSGTARG =    $(SGSMSGCOM)
  66   66  SGSMSGALL =     $(SGSMSGCOM)
  67   67  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfedit_msg
  68   68  
  69   69  SRCS =          $(COMOBJ:%.o=../common/%.c) \
  70   70                  $(COMOBJ32:%32.o=../common/%.c) \
  71   71                  $(BLTDATA)
  72   72  
  73   73  CLEANFILES +=   $(BLTFILES)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX