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

@@ -33,23 +33,23 @@
 include         $(SRC)/cmd/sgs/Makefile.com
 
 COMOBJ=         pvs.o
 BLTOBJ=         msg.o
 
-TOOLOBJS =      alist.o
+SGSCOMMONOBJ =  alist.o
 
-OBJS=           $(BLTOBJ) $(COMOBJ) $(TOOLOBJS)
+OBJS=           $(BLTOBJ) $(COMOBJ) $(SGSCOMMONOBJ)
 
 MAPFILE=        $(MAPFILE.NGB)
 MAPOPTS=        $(MAPFILE:%=-M%)
 
-CPPFLAGS +=     -I$(SRCBASE)/lib/libc/inc
+CPPFLAGS +=     -I$(SRC)/lib/libc/inc
 LLDFLAGS =      '-R$$ORIGIN/../lib'
 LLDFLAGS64 =    '-R$$ORIGIN/../../lib/$(MACH64)'
-LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
-LDLIBS +=       $(LDDBGLIBDIR) $(LDDBG_LIB) $(ELFLIBDIR) -lelf \
-                    $(CONVLIBDIR) $(CONV_LIB)
+LDFLAGS +=      $(VERSREF) $(MAPOPTS) $(LLDFLAGS)
+LDLIBS +=       $(LDDBGLIBDIR) -llddbg $(ELFLIBDIR) -lelf \
+                    $(CONVLIBDIR) -lconv
 
 # not linted
 SMATCH=off
 
 BLTDEFS=        msg.h

@@ -63,8 +63,8 @@
 SGSMSGALL=      $(SGSMSGCOM)
 
 SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n pvs_msg
 
 SRCS=           $(COMOBJ:%.o=../common/%.c) $(BLTDATA) \
-                $(TOOLOBJS:%.o=$(SGSTOOLS)/common/%.c)
+                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c)
 
 CLEANFILES +=   $(BLTFILES)