aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2021-04-12 19:24:41 -0700
committerNoah Misch <noah@leadboat.com>2021-04-12 19:24:41 -0700
commit455dbc010be53ac61fcb2da83b1e565f4c263449 (patch)
treee754b4cfba70aed46305a121958476b43eb2ab4b /src
parentc3556f6fac349b31da2fd00107469ce36fb37536 (diff)
downloadpostgresql-455dbc010be53ac61fcb2da83b1e565f4c263449.tar.gz
postgresql-455dbc010be53ac61fcb2da83b1e565f4c263449.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/adt/Makefile2
-rw-r--r--src/test/isolation/Makefile3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 279ff15ade9..41b486bceff 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -8,6 +8,8 @@ subdir = src/backend/utils/adt
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
+
# keep this list arranged alphabetically or it gets to be a mess
OBJS = \
acl.o \
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index edff04f041c..0d452c89d40 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -9,7 +9,8 @@ subdir = src/test/isolation
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) \
+ -I$(srcdir)/../regress $(CPPFLAGS)
OBJS = \
$(WIN32RES) \