From 902d2b8bac8bf87dae85b865e22ddcae8cd9c670 Mon Sep 17 00:00:00 2001
From: Bryan Henderson <bryanh@giraffe.netgate.net>
Date: Thu, 14 Nov 1996 07:33:34 +0000
Subject: [PATCH] Use -Wno-error option only if compiler is gcc.

---
 src/backend/bootstrap/Makefile | 23 +++++++++++++++--------
 src/backend/parser/Makefile    | 23 +++++++++++++++--------
 src/backend/tcop/Makefile      | 21 ++++++++++++++-------
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index beb2756c94..6702bce1b6 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.3 1996/11/09 06:17:44 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.4 1996/11/14 07:33:20 bryanh Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -18,18 +18,25 @@
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
+SRCDIR= ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../../include
+INCLUDE_OPT= -I.. \
+             -I../port/$(PORTNAME) \
+             -I../../include
 
-CFLAGS += $(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT) 
 
-BOOTYACCS = bootstrap_tokens.h bootparse.c
+ifeq ($(CC), gcc)
+# Until we figure out how to get rid of the warnings in this directory,
+# we must turn off any -Werror that is in CFLAGS now.  These options only
+# exist for the gcc compiler.
+CFLAGS+= -Wno-error
+endif
+
+BOOTYACCS= bootstrap_tokens.h bootparse.c
 
-OBJS = bootparse.o bootscanner.o bootstrap.o 
+OBJS= bootparse.o bootscanner.o bootstrap.o 
 
 all: SUBSYS.o
 
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index 63b01a5418..2c9d6616c7 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -4,21 +4,28 @@
 #    Makefile for parser
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.3 1996/11/09 06:18:34 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.4 1996/11/14 07:33:30 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
+SRCDIR= ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../../include
+INCLUDE_OPT= -I.. \
+             -I../port/$(PORTNAME) \
+             -I../../include
 
-CFLAGS+=$(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT)
 
-OBJS = analyze.o catalog_utils.o dbcommands.o gram.o \
-       keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o
+ifeq ($(CC), gcc)
+# Until we figure out how to get rid of the warnings in this directory,
+# we must turn off any -Werror that is in CFLAGS now.  These options only
+# exist for the gcc compiler.
+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
 
 all: SUBSYS.o
 
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index b4fcb90022..719eaa2af2 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,20 +4,27 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.6 1996/11/10 04:09:51 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.7 1996/11/14 07:33:34 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
+SRCDIR= ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../../include
+INCLUDE_OPT= -I.. \
+             -I../port/$(PORTNAME) \
+             -I../../include
 
-CFLAGS+=$(INCLUDE_OPT) -Wno-error
+CFLAGS+= $(INCLUDE_OPT)
 
-OBJS = aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
+ifeq ($(CC), gcc)
+# Until we figure out how to get rid of the warnings in this directory,
+# we must turn off any -Werror that is in CFLAGS now.  These options only
+# exist for the gcc compiler.
+CFLAGS+= -Wno-error
+endif
+
+OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
 
 all: SUBSYS.o
 
-- 
GitLab