diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-04-10 12:41:51 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-04-10 12:41:51 -0400 |
| commit | 1a40485af6e43be501500a88b1b9765cc0d69c0b (patch) | |
| tree | bec75268e6e51a1dd9b45f3d0f174c0a04c011bf /src | |
| parent | 29d7ebf51ee33e1711fc9681f273f3de2da76ebf (diff) | |
| download | postgresql-1a40485af6e43be501500a88b1b9765cc0d69c0b.tar.gz postgresql-1a40485af6e43be501500a88b1b9765cc0d69c0b.zip | |
Fix pgxs.mk to not try to build generated headers in external builds.
Per Julien Rouhaud and the buildfarm. This is not quite Julien's
patch: there's no need to lobotomize this build rule when building
contrib modules in-tree, so set NO_GENERATED_HEADERS only if PGXS.
In passing, also set NO_TEMP_INSTALL in external builds. This doesn't
seem to be fixing any live bug, because "make check" in an external
build just produces the expected error message without first trying to
make a temp install ... but it's far from obvious why it doesn't, so
this change seems like good future-proofing.
Julien Rouhaud and Tom Lane
Discussion: https://postgr.es/m/CAOBaU_YH=g68opbbMk8is3jNwhoXGa8ckRSre1nx0Obe1C7i-Q@mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefiles/pgxs.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index c038836e73d..bfae02f90ce 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -62,6 +62,12 @@ endif ifdef PGXS + +# External extensions must assume generated headers are available +NO_GENERATED_HEADERS=yes +# The temp-install rule won't work, either +NO_TEMP_INSTALL=yes + # We assume that we are in src/makefiles/, so top is ... top_builddir := $(dir $(PGXS))../.. include $(top_builddir)/src/Makefile.global @@ -75,7 +81,8 @@ endif ifeq ($(FLEX),) FLEX = flex endif -endif + +endif # PGXS override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) |