4 files changed, 4 insertions, 11 deletions
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 839864c7f8e..5a98e5a2b0b 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -9,10 +9,6 @@ DLSUFFIX = .so
 
 CFLAGS_SL = -fPIC -DPIC
 
-ifeq ($(findstring i386,$(host_cpu)), i386)
-allow_nonpic_in_shlib = yes
-endif
-
 
 # Rule for building a shared library from a single .o file
 %.so: %.o
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index cc5cbff2b36..52bf0b1e2ba 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -3,7 +3,6 @@ export_dynamic = -Wl,-E
 # Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
 # This allows LD_LIBRARY_PATH to still work when needed.
 rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
-allow_nonpic_in_shlib = yes
 DLSUFFIX = .so
 
 ifeq "$(findstring sparc,$(host_cpu))" "sparc"
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index b469b269749..e1f94937f6f 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 122cdd984d6..afd8dea17ef 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)