diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 438a3253f..64d675d6d 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -41,6 +41,11 @@ Linux)
     case `uname -m` in
         i686)
             export WM_ARCH_OPTION=32
+            export WM_CC='gcc'
+            export WM_CXX='g++'
+            export WM_CFLAGS='-fPIC'
+            export WM_CXXFLAGS='-fPIC -std=c++0x'
+            export WM_LDFLAGS=
         ;;
 
     x86_64)
@@ -76,6 +81,7 @@ Linux)
 
     armv7l)
         WM_ARCH=linuxARM7
+        export WM_ARCH_OPTION=32
         export WM_COMPILER_LIB_ARCH=32
         export WM_CC='gcc'
         export WM_CXX='g++'