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

@@ -65,12 +65,12 @@
 SHDR_PICS=      $(SHDR_OBJ:%.o=$(PICDIR)/%.o)
 STR_PICS=       $(STR_OBJ:%.o=$(PICDIR)/%.o)
 SYM_PICS=       $(SYM_OBJ:%.o=$(PICDIR)/%.o)
 SYMINFO_PICS=   $(SYMINFO_OBJ:%.o=$(PICDIR)/%.o)
 
-LDLIBS +=       $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) $(LDDBG_LIB) \
-                $(CONVLIBDIR) $(CONV_LIB) -lc
+LDLIBS +=       $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \
+                $(CONVLIBDIR) -lconv -lc
 
 $(CAP_LIB):=            PICS = $(CAP_PICS)
 $(DYN_LIB):=            PICS = $(DYN_PICS)
 $(EHDR_LIB):=           PICS = $(EHDR_PICS)
 $(PHDR_LIB):=           PICS = $(PHDR_PICS)

@@ -90,14 +90,14 @@
 
 # All the modules use a shared mapfile
 MAPFILES = ../common/mapfile-vers
 
 CPPFLAGS +=     -I../../../include -I../../../include/$(MACH) \
-                -I../$(SRCBASE)/lib/libc/inc  -D_REENTRANT
+                -I$(SRC)/lib/libc/inc  -D_REENTRANT
 LLDFLAGS =      '-R$$ORIGIN/../../../lib'
 LLDFLAGS64 =    '-R$$ORIGIN/../../../../lib/$(MACH64)'
-LDFLAGS +=      $(CC_USE_PROTO) $(LLDFLAGS)
+LDFLAGS +=      $(LLDFLAGS)
 DYNFLAGS +=     $(VERSREF)
 
 CERRWARN +=     -_gcc=-Wno-switch
 CERRWARN +=     -_gcc=-Wno-uninitialized