diff options
| author | Peter Eisentraut | 2012-12-18 06:13:59 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2012-12-18 06:13:59 +0000 |
| commit | 1a5f04dd7eed0ac27cc5da9520ef55e16531bca6 (patch) | |
| tree | 1b8bb9199cf95c71ce35673f59a9e64b26555c99 /src/pl | |
| parent | 8d2e9a9dbd56aabb9273fbc30ca6c03d6f24b996 (diff) | |
Remove allow_nonpic_in_shlib
This was used in a time when a shared libperl or libpython was difficult
to come by. That is obsolete, and the idea behind the flag was never
fully portable anyway and will likely fail on more modern CPU
architectures.
Diffstat (limited to 'src/pl')
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 5 | ||||
| -rw-r--r-- | src/pl/plpython/Makefile | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index b469b26974..e1f94937f6 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -12,9 +12,8 @@ ifeq ($(perl_useshrplib),yes) shared_libperl = yes endif -# If we don't have a shared library and the platform doesn't allow it -# to work without, we have to skip it. -ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib))) +# If we don't have a shared library, we have to skip it. +ifeq ($(shared_libperl),yes) ifeq ($(PORTNAME), win32) perl_archlibexp := $(subst \,/,$(perl_archlibexp)) diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index 122cdd984d..afd8dea17e 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -28,9 +28,8 @@ override python_libspec = -framework Python override python_additional_libs = endif -# If we don't have a shared library and the platform doesn't allow it -# to work without, we have to skip it. -ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib))) +# If we don't have a shared library, we have to skip it. +ifeq ($(shared_libpython),yes) override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS) |