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

@@ -24,19 +24,19 @@
 #
 # Copyright 2016 RackTop Systems.
 # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
-pics/%.o:       ../common/%.c
+pics/%.o:       $(SRCDIR)/common/%.c
                 $(COMPILE.c) -o $@ $<
                 $(POST_PROCESS_O)
 
-pics/%32.o:     ../common/%.c
+pics/%32.o:     $(SRCDIR)/common/%.c
                 $(COMPILE.c) -o $@ $<
                 $(POST_PROCESS_O)
 
-pics/%64.o:     ../common/%.c
+pics/%64.o:     $(SRCDIR)/common/%.c
                 $(COMPILE.c) -o $@ -D_ELF64 $<
                 $(POST_PROCESS_O)
 
 pics/%32.o:     %.c
                 $(COMPILE.c) -o $@ $<

@@ -44,11 +44,11 @@
 
 pics/%64.o:     %.c
                 $(COMPILE.c) -o $@ -D_ELF64 $<
                 $(POST_PROCESS_O)
 
-pics/%.o:       $(SGSTOOLS)/common/%.c
+pics/%.o:       $(SGSCOMMON)/%.c
                 $(COMPILE.c) -o $@ $<
                 $(POST_PROCESS_O)
 
 pics/%.o:       $(VAR_AVLDIR)/%.c
                 $(COMPILE.c) -o $@ $<

@@ -92,25 +92,12 @@
                 $(RM) $@; $(SYMLINK) $(DYNLIB) $@
 
 delete:
                 $(RM) $(DYNLIB)
 
-# Special target for native builds (ie. when we need to build a version of ld
-# to build a version of ld :-).
-
-native:         $(SGSLIBDIR)/$(LIBLINKS)
-
 $(PICS):        pics
 
-$(SGSLIBDIR)/$(DYNLIB): $(PICS) $(SGSLIBDIR)
-                $(BUILD.SO)
-                $(POST_PROCESS_SO)
-
-$(SGSLIBDIR)/$(LIBLINKS): $(SGSLIBDIR)/$(DYNLIB)
-                @$(RM) $(SGSLIBDIR)/$(LIBLINKS)
-                $(SYMLINK) $(DYNLIB) $(SGSLIBDIR)/$(LIBLINKS)
-
 include         $(SRC)/lib/Makefile.targ
 include         $(SRC)/cmd/sgs/Makefile.targ
 
 # Derived source and header files (messaging).