mirror of
https://github.com/postgres/postgres.git
synced 2025-06-01 00:01:20 -04:00
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
This commit is contained in:
parent
29d7ebf51e
commit
1a40485af6
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user