git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3556f6)
Use "-I." in directories holding Bison parsers, for Oracle compilers.
author Noah Misch <noah@leadboat.com>
2021年4月13日 02:24:41 +0000 (19:24 -0700)
committer Noah Misch <noah@leadboat.com>
2021年4月13日 02:24:41 +0000 (19:24 -0700)
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).

src/backend/utils/adt/Makefile patch | blob | blame | history
src/test/isolation/Makefile patch | blob | blame | history

diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 279ff15ade9251a39756410e80db85ae558c29ff..41b486bceffae6b4b916e5975f97d0e4da5cc4f2 100644 (file)
--- 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 edff04f041cdf06a9cba7b9a6d8ed75145385c67..0d452c89d40cff34fb3b12ed890d3f9ea5f1a218 100644 (file)
--- 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) \
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /