5 files changed, 10 insertions, 19 deletions
diff --git a/usr/src/cmd/awk/Makefile b/usr/src/cmd/awk/Makefile
index f0261a4bf2..3eb805c71a 100644
--- a/usr/src/cmd/awk/Makefile
+++ b/usr/src/cmd/awk/Makefile
@@ -77,7 +77,7 @@ proctab.c: maketab
 	rm -f $@; ./maketab > $@
 
 maketab: maketab.c
-	$(NATIVECC) -O maketab.c -o $@ $(LDLIBS)
+	$(NATIVECC) $(NATIVE_CFLAGS) maketab.c -o $@ $(LDLIBS)
 
 install: all $(ROOTPROG) $(ROOTLINK)
 
diff --git a/usr/src/cmd/sgs/elfdump/Makefile.targ b/usr/src/cmd/sgs/elfdump/Makefile.targ
index f4d74fa9c6..5cb4d96437 100644
--- a/usr/src/cmd/sgs/elfdump/Makefile.targ
+++ b/usr/src/cmd/sgs/elfdump/Makefile.targ
@@ -65,7 +65,7 @@ gen_layout_obj.o := CFLAGS64 += $(CTF_FLAGS)
 gen_layout_obj.o := POST_PROCESS_O = $(CTFCONVERT_O)
 
 gen_struct_layout:	../common/gen_struct_layout.c
-		$(NATIVECC) $(NATIVECC_CFLAGS) -o $@ \
+		$(NATIVECC) $(NATIVE_CFLAGS) -o $@ \
 			../common/gen_struct_layout.c -lctf
 
 clean:
diff --git a/usr/src/cmd/sgs/tools/Makefile.com b/usr/src/cmd/sgs/tools/Makefile.com
index 75c6dee092..6c7ba8f99d 100644
--- a/usr/src/cmd/sgs/tools/Makefile.com
+++ b/usr/src/cmd/sgs/tools/Makefile.com
@@ -44,7 +44,6 @@ COMOBJS=
 NATOBJS=	piglatin.o
 
 OBJECTS=	$(COMOBJS)  $(NATOBJS)
-NATIVECC_CFLAGS = -O
 
 AVLOBJ=		avl.o
 TOOL_OBJS=	sgsmsg.o string_table.o findprime.o assfail.o
@@ -52,7 +51,7 @@ SGSMSG_OBJS=	$(TOOL_OBJS) $(AVLOBJ)
 SGSMSG_SRCS=	$(TOOL_OBJS:%.o=../common/%.c) \
 		$(AVLOBJ:%.o=$(VAR_AVLDIR)/%.c)
 
-$(SGSMSG_OBJS) := NATIVECC_CFLAGS += -I../../include $(VAR_TOOLS_CPPFLAGS)
+$(SGSMSG_OBJS) := NATIVE_CFLAGS += -I../../include $(VAR_TOOLS_CPPFLAGS)
 
 PROGS=		$(COMOBJS:%.o=%)
 NATIVE=		$(NATOBJS:%.o=%) sgsmsg
diff --git a/usr/src/cmd/sgs/tools/Makefile.targ b/usr/src/cmd/sgs/tools/Makefile.targ
index a1f5305117..5ae70de358 100644
--- a/usr/src/cmd/sgs/tools/Makefile.targ
+++ b/usr/src/cmd/sgs/tools/Makefile.targ
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/sgs/tools/Makefile.targ
 
 
 $(ROOTDIR)/bin/%:	%
@@ -35,22 +33,22 @@ $(ROOTDIR)/lib/%:	%
 		$(INS.file)
 
 sgsmsg:		$(SGSMSG_OBJS)
-		$(NATIVECC) $(DEBUG) $(NATIVECC_CFLAGS) \
+		$(NATIVECC) $(DEBUG) $(NATIVE_CFLAGS) \
 			-o $@ $(SGSMSG_OBJS)
 
 sgsmsg.o:	../common/sgsmsg.c
-		$(NATIVECC) $(DEBUG) $(NATIVECC_CFLAGS) -c ../common/sgsmsg.c
+		$(NATIVECC) $(DEBUG) $(NATIVE_CFLAGS) -c ../common/sgsmsg.c
 
 string_table.o:	../common/string_table.c
-		$(NATIVECC) $(DEBUG) $(NATIVECC_CFLAGS) -c \
+		$(NATIVECC) $(DEBUG) $(NATIVE_CFLAGS) -c \
 		    ../common/string_table.c
 
 avl.o:		$(VAR_AVLDIR)/avl.c
-		$(NATIVECC) $(DEBUG) $(NATIVECC_CFLAGS) -c \
+		$(NATIVECC) $(DEBUG) $(NATIVE_CFLAGS) -c \
 		    $(VAR_AVLDIR)/avl.c
 
 piglatin:	../common/piglatin.c
-		$(NATIVECC) $(NATIVECC_CFLAGS) -o $@ ../common/piglatin.c
+		$(NATIVECC) $(NATIVE_CFLAGS) -o $@ ../common/piglatin.c
 
 %:		%.o
 		$(LINK.c) -o $@ $< $(LDLIBS)
diff --git a/usr/src/cmd/zic/Makefile b/usr/src/cmd/zic/Makefile
index 43a2db0ba0..5984f9a689 100644
--- a/usr/src/cmd/zic/Makefile
+++ b/usr/src/cmd/zic/Makefile
@@ -66,7 +66,7 @@ install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) \
 	$(NPROG) -d $(ROOTTZD) $(TZFILES)
 
 $(NPROG): $(NATIVE) $(NOBJS)
-	$(NATIVECC) -o $@ $(NOBJS)
+	$(NATIVECC) $(NATIVE_CFLAGS) -o $@ $(NOBJS)
 
 #
 # XXX
@@ -95,16 +95,10 @@ clean:
 lint: lint_SRCS
 
 $(NOBJS): $$(@F:.o=.c)
-	$(NATIVECC) -O $(NCPPFLAGS) -c -o $@ $(@F:.o=.c)
+	$(NATIVECC) -O $(NATIVE_CFLAGS) $(NCPPFLAGS) -c -o $@ $(@F:.o=.c)
 
 $(NATIVE)/zic.o: $(NATIVE)/tzfile.h
 
-#$(NATIVE)/scheck.o: scheck.c
-#	$(NATIVECC) -c -o $@ scheck.c
-
-#$(NATIVE)/ialloc.o: ialloc.c
-#	$(NATIVECC) -c -o $@ ialloc.c
-
 $(NATIVE)/tzfile.h: $(ROOT)/usr/include/tzfile.h
 	$(RM) $@; cp $(ROOT)/usr/include/tzfile.h $@