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

Commit 4749c7f

Browse files
committed
Use "-I." in directories holding Bison parsers, for Oracle compilers.
With the Oracle Developer Studio 12.6 compiler, #line directives alter the current source file location for purposes of #include "..." directives. Hence, a VPATH build failed with 'cannot find include file: "specscanner.c"'. With two exceptions, parser-containing directories already add "-I. -I$(srcdir)"; eliminate the exceptions. Back-patch to 9.6 (all supported versions).
1 parent e3ac7d1 commit 4749c7f

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/backend/utils/adt/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ subdir = src/backend/utils/adt
88
top_builddir = ../../../..
99
include $(top_builddir)/src/Makefile.global
1010

11+
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
12+
1113
# keep this list arranged alphabetically or it gets to be a mess
1214
OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \
1315
array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \

src/test/isolation/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ subdir = src/test/isolation
99
top_builddir = ../../..
1010
include $(top_builddir)/src/Makefile.global
1111

12-
override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
12+
override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) \
13+
-I$(srcdir)/../regress $(CPPFLAGS)
1314

1415
OBJS = specparse.o isolationtester.o $(WIN32RES)
1516

0 commit comments

Comments
 (0)