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/crle/Makefile.com
          +++ new/usr/src/cmd/sgs/crle/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=           crle
  31   31  
  32   32  include         $(SRC)/cmd/Makefile.cmd
  33   33  include         $(SRC)/cmd/sgs/Makefile.com
  34   34  
  35   35  COMOBJ=         config.o        crle.o          depend.o        dump.o \
  36   36                  inspect.o       hash.o          print.o         util.o
  37   37  BLTOBJ=         msg.o
  38      -TOOLSOBJ=       alist.o
       38 +SGSCOMMONOBJ=   alist.o
  39   39  
  40      -OBJS=           $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
       40 +OBJS=           $(BLTOBJ) $(COMOBJ) $(SGSCOMMONOBJ)
  41   41  
  42   42  MAPFILE=        $(MAPFILE.NGB)
  43   43  MAPOPT=         $(MAPFILE:%=-M%)
  44   44  
  45   45  # not linted
  46   46  SMATCH=off
  47   47  
  48      -CPPFLAGS +=     -I$(SRC)/common/sgsrtcid -I$(SRCBASE)/uts/$(ARCH)/sys \
       48 +CPPFLAGS +=     -I$(SRC)/common/sgsrtcid -I$(SRC)/uts/$(ARCH)/sys \
  49   49                  -D__EXTENSIONS__
  50   50  LLDFLAGS =      '-R$$ORIGIN/../lib'
  51   51  LLDFLAGS64 =    '-R$$ORIGIN/../../lib/$(MACH64)'
  52      -LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) \
  53      -                        $(LLDFLAGS) $(ZNOLAZYLOAD)
  54      -LDLIBS +=       -lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB)
       52 +LDFLAGS +=      $(VERSREF) $(MAPOPT) $(LLDFLAGS) $(ZNOLAZYLOAD)
       53 +LDLIBS +=       -lelf $(CONVLIBDIR) -lconv
  55   54  
  56   55  BLTDEFS=        msg.h
  57   56  BLTDATA=        msg.c
  58   57  BLTMESG=        $(SGSMSGDIR)/crle
  59   58  
  60   59  BLTFILES=       $(BLTDEFS) $(BLTDATA) $(BLTMESG)
  61   60  
  62   61  SGSMSGCOM=      ../common/crle.msg
  63   62  SGSMSGTARG=     $(SGSMSGCOM)
  64   63  SGSMSGALL=      $(SGSMSGCOM)
  65   64  
  66   65  SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n crle_msg
  67   66  
  68   67  SRCS=           $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \
  69      -                $(TOOLSOBJ:%.o=$(SGSTOOLS)/common/%.c)
       68 +                $(COMMON:%.o=$(SGSCOMMON)/%.c)
  70   69  
  71   70  CLEANFILES +=   $(BLTFILES)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX