wscript: check for fPIC before removing

5 years ago · 49445f0663
2 changed files with 9 additions and 5 deletions
--- a/2
+++ b/2
@ -1 +1 @@
				@@ -1 +1 @@
-Subproject commit f197117dacd1938fe3afca34716e4b7b60b6f837
+Subproject commit 01d964d27ac28d9bc075c65a830d6cef911f9ed7
--- a/4
+++ b/4
@ -182,9 +182,13 @@ def configure(conf):
				@@ -182,9 +182,13 @@ def configure(conf):
 			conf.env.append_unique('CFLAGS_cstlib', '-fPIC')
 			conf.env.append_unique('CXXFLAGS_cxxstlib', '-fPIC')
 	else:
+		if '-fPIC' in conf.env.CFLAGS_cshlib:
 			conf.env.CFLAGS_cshlib.remove('-fPIC')
+		if '-fPIC' in conf.env.CXXFLAGS_cshlib:
 			conf.env.CXXFLAGS_cxxshlib.remove('-fPIC')
+		if '-fPIC' in conf.env.CFLAGS_MACBUNDLE:
 			conf.env.CFLAGS_MACBUNDLE.remove('-fPIC')
+		if '-fPIC' in conf.env.CXXFLAGS_MACBUNDLE:
 			conf.env.CXXFLAGS_MACBUNDLE.remove('-fPIC')

 	# We restrict 64-bit builds ONLY for Win/Linux/OSX running on Intel architecture