diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 07:58:12 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2014-12-04 08:45:38 -0500 |
| commit | 4e4b9002498b72c7000a675216470e8918fc0420 (patch) | |
| tree | 40b42920fdb67e6ca4f52d2fad99b2bb0f93f7cf /src | |
| parent | 3e2dc9703a4835ace14310f82369df0a4e8528f2 (diff) | |
Fix SHLIB_PREREQS use in contrib, allowing PGXS builds
dblink and postgres_fdw use SHLIB_PREREQS = submake-libpq to build libpq
first. This doesn't work in a PGXS build, because there is no libpq to
build. So just omit setting SHLIB_PREREQS in this case.
Note that PGXS users can still use SHLIB_PREREQS (although it is not
documented). The problem here is only that contrib modules can be built
in-tree or using PGXS, and the prerequisite is only applicable in the
former case.
Commit 6697aa2bc25c83b88d6165340348a31328c35de6 previously attempted to
address this by creating a somewhat fake submake-libpq target in
Makefile.global. That was not the right fix, and it was also done in a
nonportable way, so revert that.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index aa54f94763e..d7a83c89a2d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -456,23 +456,13 @@ ifeq ($(PORTNAME),cygwin) libpq_pgport += $(LDAP_LIBS_FE) endif -# If PGXS is not defined, build libpq and libpgport dependencies as required. -# If the build is with PGXS, then these are supposed to be already built and -# installed, and we just ensure that the expected files exist. -ifndef PGXS + submake-libpq: $(MAKE) -C $(libpq_builddir) all -else -submake-libpq: $(libdir)/libpq.so ; -endif -ifndef PGXS submake-libpgport: $(MAKE) -C $(top_builddir)/src/port all $(MAKE) -C $(top_builddir)/src/common all -else -submake-libpgport: $(libdir)/libpgport.a $(libdir)/libpgcommon.a ; -endif .PHONY: submake-libpq submake-libpgport |