diff --git a/mainui b/mainui
index f197117d..01d964d2 160000
--- a/mainui
+++ b/mainui
@@ -1 +1 @@
-Subproject commit f197117dacd1938fe3afca34716e4b7b60b6f837
+Subproject commit 01d964d27ac28d9bc075c65a830d6cef911f9ed7
diff --git a/wscript b/wscript
index 31029639..6abd3c2d 100644
--- a/wscript
+++ b/wscript
@@ -182,10 +182,14 @@ def configure(conf):
 			conf.env.append_unique('CFLAGS_cstlib', '-fPIC')
 			conf.env.append_unique('CXXFLAGS_cxxstlib', '-fPIC')
 	else:
-		conf.env.CFLAGS_cshlib.remove('-fPIC')
-		conf.env.CXXFLAGS_cxxshlib.remove('-fPIC')
-		conf.env.CFLAGS_MACBUNDLE.remove('-fPIC')
-		conf.env.CXXFLAGS_MACBUNDLE.remove('-fPIC')
+		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
 	# Because compatibility with original GoldSrc