Print this page
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

@@ -38,25 +38,25 @@
 
 COMOBJ32 =      elfwrap32.o
 
 COMOBJ64 =      elfwrap64.o
 
-TOOLOBJS =      alist.o
+SGSCOMMONOBJ =  alist.o
 
 BLTOBJ =        msg.o
 
 OBJS=           $(BLTOBJ) $(COMOBJ) $(MACHOBJ) $(COMOBJ32) $(COMOBJ64) \
-                $(TOOLOBJS)
+                $(SGSCOMMONOBJ)
 
 MAPFILES =      $(MAPFILE.NGB)
 MAPOPTS =       $(MAPFILES:%=-M%)
 
 CPPFLAGS =      -I. -I../common -I../../include $(CPPFLAGS.master) -I$(ELFCAP)
 LLDFLAGS =
 LLDFLAGS64 =
-LDFLAGS +=      $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(LLDFLAGS)
-LDLIBS +=       $(ELFLIBDIR) -lelf $(CONVLIBDIR) $(CONV_LIB)
+LDFLAGS +=      $(VERSREF) $(MAPOPTS) $(LLDFLAGS)
+LDLIBS +=       $(ELFLIBDIR) -lelf $(CONVLIBDIR) -lconv
 
 CERRWARN +=     -_gcc=-Wno-uninitialized
 
 BLTDEFS =       msg.h
 BLTDATA =       msg.c

@@ -69,8 +69,8 @@
 SGSMSGALL =     $(SGSMSGCOM)
 SGSMSGFLAGS +=  -h $(BLTDEFS) -d $(BLTDATA) -m $(BLTMESG) -n elfwrap_msg
 
 SRCS =          $(COMOBJ:%.o=../common/%.c) ../common/machine.c \
                 $(COMOBJ32:%32.o=../common/%.c) \
-                $(TOOLOBJ:%.o=../../tools/common/%.c) $(BLTDATA)
+                $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) $(BLTDATA)
 
 CLEANFILES +=   $(BLTFILES)