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

@@ -32,24 +32,24 @@
 include         $(SRC)/cmd/Makefile.cmd
 include         $(SRC)/cmd/sgs/Makefile.com
 
 COMOBJ=         ldd.o
 BLTOBJ=         msg.o
-TOOLSOBJ=       alist.o
+SGSCOMMONOBJ=   alist.o
 
-OBJS=           $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
+OBJS=           $(BLTOBJ) $(COMOBJ) $(SGSCOMMONOBJ)
 
 MAPFILE=        $(MAPFILE.NGB)
 MAPOPTS=        $(MAPFILE:%=-M%)
 
 CPPFLAGS +=     -I. -I../../include -I../../include/$(MACH) \
-                -I$(SRCBASE)/uts/$(ARCH)/sys \
+                -I$(SRC)/uts/$(ARCH)/sys \
                 $(CPPFLAGS.master)
 LLDFLAGS =      '-R$$ORIGIN/../../lib'
 LLDFLAGS64 =    '-R$$ORIGIN/../../../lib/$(MACH64)'
-LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
-LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) -lelf $(DLLIB)
+LDFLAGS +=      $(VERSREF) $(MAPOPTS) $(LLDFLAGS)
+LDLIBS +=       $(CONVLIBDIR) -lconv -lelf
 
 SMOFF += or_vs_and
 
 BLTDEFS=        msg.h
 BLTDATA=        msg.c

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