From acd73ad1a17f7aed6a914dd9c331f1043d89988d Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Thu, 2 Feb 2017 11:21:16 -0500 Subject: Code review for avoidance of direct cross-module links. Remove $(pkglibdir) from $(rpathdir), since commits d51924be886c2a05e691fa05b16cb6b30ab8370f and eda04886c1e048d695728206504ab4198462168e removed direct linkage to objects stored there. Users are unlikely to notice the difference. Accompany every $(python_libspec) with $(python_additional_libs); this doesn't fix a demonstrated bug, but it might do so on rare Python configurations. With these changes, AIX ceases to be a special case. --- contrib/ltree_plpython/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'contrib/ltree_plpython') diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile index c45b7c2b097..bc7502b8c32 100644 --- a/contrib/ltree_plpython/Makefile +++ b/contrib/ltree_plpython/Makefile @@ -24,17 +24,12 @@ include $(top_srcdir)/contrib/contrib-global.mk endif # We must link libpython explicitly -ifeq ($(PORTNAME), aix) -rpathdir = $(pkglibdir):$(python_libdir) -SHLIB_LINK += $(python_libspec) $(python_additional_libs) -else ifeq ($(PORTNAME), win32) # ... see silliness in plpython Makefile ... SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) else rpathdir = $(python_libdir) -SHLIB_LINK += $(python_libspec) -endif +SHLIB_LINK += $(python_libspec) $(python_additional_libs) endif REGRESS_OPTS += --load-extension=ltree -- cgit v1.2.3