Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 902d2b8

Browse files
author
Bryan Henderson
committed
Use -Wno-error option only if compiler is gcc.
1 parent b4d6890 commit 902d2b8

File tree

3 files changed

+44
-23
lines changed

3 files changed

+44
-23
lines changed

src/backend/bootstrap/Makefile

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.3 1996/11/09 06:17:44 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.4 1996/11/14 07:33:20 bryanh Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -18,18 +18,25 @@
1818
#
1919
#-------------------------------------------------------------------------
2020

21-
SRCDIR = ../..
21+
SRCDIR= ../..
2222
include ../../Makefile.global
2323

24-
INCLUDE_OPT = -I.. \
25-
-I../port/$(PORTNAME) \
26-
-I../../include
24+
INCLUDE_OPT= -I.. \
25+
-I../port/$(PORTNAME) \
26+
-I../../include
2727

28-
CFLAGS += $(INCLUDE_OPT) -Wno-error
28+
CFLAGS+= $(INCLUDE_OPT)
2929

30-
BOOTYACCS = bootstrap_tokens.h bootparse.c
30+
ifeq ($(CC), gcc)
31+
# Until we figure out how to get rid of the warnings in this directory,
32+
# we must turn off any -Werror that is in CFLAGS now. These options only
33+
# exist for the gcc compiler.
34+
CFLAGS+= -Wno-error
35+
endif
36+
37+
BOOTYACCS= bootstrap_tokens.h bootparse.c
3138

32-
OBJS = bootparse.o bootscanner.o bootstrap.o
39+
OBJS= bootparse.o bootscanner.o bootstrap.o
3340

3441
all: SUBSYS.o
3542

src/backend/parser/Makefile

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,28 @@
44
# Makefile for parser
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.3 1996/11/09 06:18:34 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.4 1996/11/14 07:33:30 bryanh Exp $
88
#
99
#-------------------------------------------------------------------------
1010

11-
SRCDIR = ../..
11+
SRCDIR= ../..
1212
include ../../Makefile.global
1313

14-
INCLUDE_OPT = -I.. \
15-
-I../port/$(PORTNAME) \
16-
-I../../include
14+
INCLUDE_OPT= -I.. \
15+
-I../port/$(PORTNAME) \
16+
-I../../include
1717

18-
CFLAGS+=$(INCLUDE_OPT) -Wno-error
18+
CFLAGS+= $(INCLUDE_OPT)
1919

20-
OBJS = analyze.o catalog_utils.o dbcommands.o gram.o \
21-
keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o
20+
ifeq ($(CC), gcc)
21+
# Until we figure out how to get rid of the warnings in this directory,
22+
# we must turn off any -Werror that is in CFLAGS now. These options only
23+
# exist for the gcc compiler.
24+
CFLAGS+= -Wno-error
25+
endif
26+
27+
OBJS= analyze.o catalog_utils.o dbcommands.o gram.o \
28+
keywords.o parser.o parse_query.o scan.o scansup.o sysfunc.o
2229

2330
all: SUBSYS.o
2431

src/backend/tcop/Makefile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,27 @@
44
# Makefile for tcop
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.6 1996/11/10 04:09:51 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.7 1996/11/14 07:33:34 bryanh Exp $
88
#
99
#-------------------------------------------------------------------------
1010

11-
SRCDIR = ../..
11+
SRCDIR= ../..
1212
include ../../Makefile.global
1313

14-
INCLUDE_OPT = -I.. \
15-
-I../port/$(PORTNAME) \
16-
-I../../include
14+
INCLUDE_OPT= -I.. \
15+
-I../port/$(PORTNAME) \
16+
-I../../include
1717

18-
CFLAGS+=$(INCLUDE_OPT) -Wno-error
18+
CFLAGS+= $(INCLUDE_OPT)
1919

20-
OBJS = aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
20+
ifeq ($(CC), gcc)
21+
# Until we figure out how to get rid of the warnings in this directory,
22+
# we must turn off any -Werror that is in CFLAGS now. These options only
23+
# exist for the gcc compiler.
24+
CFLAGS+= -Wno-error
25+
endif
26+
27+
OBJS= aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
2128

2229
all: SUBSYS.o
2330

0 commit comments

Comments
 (0)