From 25c09da2604d366ace17d3632129503396ab7e5c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 17 May 2015 18:30:11 +0100
Subject: [PATCH] etc/config/settings: Set WM_ARCH_OPTION=32 on 32bit OSs

---
 etc/bashrc              | 2 +-
 etc/config/settings.csh | 1 +
 etc/config/settings.sh  | 3 ++-
 etc/cshrc               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index c10f68ced..18fad3998 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -68,7 +68,7 @@ unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
 #- Memory addressing:
 #    On a 64bit OS this can be 32bit or 64bit
-#    On a 32bit OS addressing is 32bin and this option is not used
+#    On a 32bit OS addressing is 32bit and this option is not used
 #    WM_ARCH_OPTION = 32 | 64
 export WM_ARCH_OPTION=64
 
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 67f7080b0..8d1155854 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -50,6 +50,7 @@ case Linux:
 
     switch (`uname -m`)
     case i686:
+        setenv WM_ARCH_OPTION 32
         breaksw
 
     case x86_64:
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 98f329579..3da683739 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -70,7 +70,8 @@ Linux)
 
     # compiler specifics
     case `uname -m` in
-    i686)
+        i686)
+            export WM_ARCH_OPTION=32
         ;;
 
     x86_64)
diff --git a/etc/cshrc b/etc/cshrc
index a2baf7f28..e1a6ada09 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -68,7 +68,7 @@ unsetenv WM_COMPILER_LIB_ARCH
 
 #- Memory addressing:
 #    On a 64bit OS this can be 32bit or 64bit
-#    On a 32bit OS addressing is 32bin and this option is not used
+#    On a 32bit OS addressing is 32bit and this option is not used
 #    WM_ARCH_OPTION = 32 | 64
 setenv WM_ARCH_OPTION 64