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

@@ -37,20 +37,20 @@
 # avoid bootstrap problems
 MCS =           /usr/ccs/bin/mcs
 
 COMOBJS =       main.o          file.o          utils.o         global.o \
                 message.o
-TOOLSOBJS =     alist.o
+SGSCOMMONOBJ =  alist.o
 
-OBJS =          $(COMOBJS) $(TOOLSOBJS)
+OBJS =          $(COMOBJS) $(SGSCOMMONOBJ)
 
 LLDFLAGS =      '-R$$ORIGIN/../../lib'
 LLDFLAGS64 =    '-R$$ORIGIN/../../../lib/$(MACH64)'
 LDFLAGS +=      $(VERSREF) $(LLDFLAGS)
-LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
+LDLIBS +=       $(CONVLIBDIR) -lconv $(ELFLIBDIR) -lelf
 
 CERRWARN +=     -_gcc=-Wno-uninitialized
 
 SRCS =          $(COMOBJS:%.o=../common/%.c) \
-                $(TOOLSOBJS:%.o=$(SGSTOOLS)/common/%.c)
+                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c)
 
 CLEANFILES +=   $(OBJS)