Skip to content

Commit 455dbc0

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 c3556f6 commit 455dbc0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/backend/utils/adt/Makefile

+2
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 = \
1315
acl.o \

src/test/isolation/Makefile

+2-1
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 = \
1516
$(WIN32RES) \

0 commit comments

Comments
 (0)