postgres.git / summary / log / commit / refs

commit    4749c7ff4932ca593fcde9928904155642c0b496
Author:   Noah Misch <noah@leadboat.com>
Date:     Tue Apr 13 02:24:41 2021 +0000
First released in: 14.0, 9.6.22, 10.17, 11.12, 12.7, 13.3

    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).


 src/backend/utils/adt/Makefile | 2 ++
 src/test/isolation/Makefile    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 580043233b3..65569162d6e 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 amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \
 	array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 228877b5b03..b79497d1b5f 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 =  specparse.o isolationtester.o $(WIN32RES)
 


[parent: e3ac7d17616b]