diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 119fa1f3cb557f3c44d143df1a16eb474049bf62..54c6748573e5e86014bd23f80359061129134cf4 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.6 1997/04/04 10:38:58 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.7 1997/04/15 17:24:07 scrappy Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -25,7 +25,11 @@ INCLUDE_OPT= -I.. \
              -I../port/$(PORTNAME) \
              -I../../include
 
-CFLAGS+= $(INCLUDE_OPT)  -Wno-error
+CFLAGS+= $(INCLUDE_OPT)  
+
+ifeq ($CC), gcc)
+CFLAGS+= -Wno-error
+endif
 
 BOOTYACCS= bootstrap_tokens.h bootparse.c
 
diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile
index 71e6491895ce0adf6656958d2b4f1275a932fc1a..2545c0a8843e8cbccf8831c8e5f4f260adac6a41 100644
--- a/src/backend/optimizer/geqo/Makefile
+++ b/src/backend/optimizer/geqo/Makefile
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Id: Makefile,v 1.5 1997/04/04 10:39:50 scrappy Exp $
+# $Id: Makefile,v 1.6 1997/04/15 17:24:17 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,7 +16,12 @@ INCLUDE_OPT = -I../.. \
               -I../../port/$(PORTNAME) \
               -I../../../include
 
-CFLAGS+=$(INCLUDE_OPT)  -Wno-error
+CFLAGS+=$(INCLUDE_OPT)
+
+ifeq ($CC), gcc)
+CFLAGS+= -Wno-error
+endif
+
 
 OBJS =	geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
 	geqo_params.o geqo_paths.o geqo_pool.o geqo_recombination.o \
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index dc1439fa618a0f926a84ef99c26311b0d62963f4..1b99d8af133aafbbaef7dfd413f105d4725692aa 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for parser
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.6 1997/04/04 10:40:11 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.7 1997/04/15 17:24:26 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,12 @@ INCLUDE_OPT= -I.. \
              -I../port/$(PORTNAME) \
              -I../../include
 
-CFLAGS+= $(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT)
+
+ifeq ($CC), gcc)
+CFLAGS+= -Wno-error
+endif
+
 
 OBJS= analyze.o catalog_utils.o dbcommands.o gram.o \
       keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o