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/i386/Makefile
          +++ new/usr/src/cmd/sgs/nm/i386/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 (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  #
  24   24  # Copyright (c) 2019, Joyent, Inc.
  25   25  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  26   26  #
  27   27  
  28   28  PROG=           nm
  29   29  XPG4PROG=       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  XPG4OBJS=       objs.xpg4/nm.o
  40   40  
  41   41  SRCS=           $(COMOBJS:%.o=../common/%.c)
  42   42  
  43   43  LLDFLAGS =      '-R$$ORIGIN/../../lib'
  44   44  INCLIST=        -I../../include -I../../include/i386 \
  45      -                -I$(SRCBASE)/uts/$(ARCH)/sys
       45 +                -I$(SRC)/uts/$(ARCH)/sys
  46   46  DEFLIST=        -DTARGET=I386 -DI386=1 -D$(ARFORMAT) -DELF
  47   47  CPPFLAGS=       $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
  48   48  
  49      -LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
       49 +LDLIBS +=       $(CONVLIBDIR) -lconv $(ELFLIBDIR) -lelf
  50   50  objs.xpg4/%.o := CPPFLAGS += -DXPG4
  51   51  
  52   52  $(DEMOBJS):=    DEFLIST = -DELF_OBJ
  53   53  
  54   54  objs.xpg4/%.o:  ../common/%.c
  55   55                  $(COMPILE.c) -o $@ $<
  56   56  
  57   57  %.o:            ../common/%.c
  58   58                  $(COMPILE.c) $<
  59   59  

  60   60  .KEEP_STATE:
  61   61  
  62   62  all:            $(PROG) $(XPG4)
  63   63  
  64   64  $(PROG):        $(OBJS)
  65   65                  $(LINK.c) $(OBJS) -o $@ $(LLDFLAGS) $(LDLIBS)
  66   66                  $(POST_PROCESS)
  67   67  
  68   68  $(XPG4):        $(XPG4OBJS)
  69   69                  $(LINK.c) $(XPG4OBJS) -o $@ $(LDLIBS)
  70   70                  $(POST_PROCESS)
  71   71  
  72   72  $(XPG4OBJS):    objs.xpg4
  73   73  
  74   74  objs.xpg4:
  75   75          -@mkdir -p $@
  76   76  
  77   77  package \
  78   78  install:        all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK)
  79   79  
  80   80  clean:
  81   81                  $(RM) $(OBJS) $(XPG4OBJS) $(CLEANFILES)
  82   82  
  83   83  include         ../../../Makefile.targ
  84   84  include         ../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX