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

@@ -40,15 +40,15 @@
 
 SRCS=           $(COMOBJS:%.o=../common/%.c)
 
 LLDFLAGS =      '-R$$ORIGIN/../../lib'
 INCLIST=        -I../../include -I../../include/i386 \
-                -I$(SRCBASE)/uts/$(ARCH)/sys
+                -I$(SRC)/uts/$(ARCH)/sys
 DEFLIST=        -DTARGET=I386 -DI386=1 -D$(ARFORMAT) -DELF
 CPPFLAGS=       $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP)
 
-LDLIBS +=       $(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf
+LDLIBS +=       $(CONVLIBDIR) -lconv $(ELFLIBDIR) -lelf
 objs.xpg4/%.o := CPPFLAGS += -DXPG4
 
 $(DEMOBJS):=    DEFLIST = -DELF_OBJ
 
 objs.xpg4/%.o:  ../common/%.c