1 files changed, 24 insertions, 2 deletions

diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 65fe841..88c0c5c 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -51,8 +51,30 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LINUX ON BOOl FORCE)
-  execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
-                  OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # If someone has specified a word size, use that to determine the
+  # architecture.  Otherwise, let the architecture specify the word size.
+
+  if ("$ENV{WORD_SIZE}" MATCHES "32")
+      set(WORD_SIZE 32)
+  elseif ("$ENV{WORD_SIZE}" MATCHES "64")
+      set(WORD_SIZE 64)
+  endif ()
+
+  if (WORD_SIZE EQUAL 32)
+    set(ARCH i686)
+  elseif (WORD_SIZE EQUAL 64)
+    set(ARCH x86_64)
+  else (WORD_SIZE EQUAL 32)
+    execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
+                    OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (ARCH STREQUAL x86_64)
+      set(WORD_SIZE 64)
+    else (ARCH STREQUAL x86_64)
+      set(WORD_SIZE 32)
+    endif (ARCH STREQUAL x86_64)
+  endif (WORD_SIZE EQUAL 32)
+
   set(LL_ARCH ${ARCH}_linux)
   set(LL_ARCH_DIR ${ARCH}-linux)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")