diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-04-10 01:14:30 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-04-10 01:14:30 +0000 |
| commit | c7c34d9ad2aade9dbf00fe58c46ac440f8af6dc9 (patch) | |
| tree | 298fa750a2b99384ae875cc8ec20c5bfecd4bf4c /indra/cmake/Variables.cmake | |
| parent | 518afb3ac53c6e0ce558a739d5032f9b93344606 (diff) | |
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
Diffstat (limited to 'indra/cmake/Variables.cmake')
| -rw-r--r-- | indra/cmake/Variables.cmake | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index c0b4191852..5868e4d07e 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -45,28 +45,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(ARCH i686) set(LL_ARCH ${ARCH}_win32) set(LL_ARCH_DIR ${ARCH}-win32) - set(WORD_SIZE 32) endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LINUX ON BOOl FORCE) - - # If someone has specified a word size, use that to determine the - # architecture. Otherwise, let the architecture specify the word size. - 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 64) - endif (ARCH STREQUAL x86_64) - endif (WORD_SIZE EQUAL 32) - + execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/ + OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) set(LL_ARCH ${ARCH}_linux) set(LL_ARCH_DIR ${ARCH}-linux) endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") @@ -89,7 +73,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") set(LL_ARCH ${ARCH}_darwin) set(LL_ARCH_DIR universal-darwin) - set(WORD_SIZE 32) endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Default deploy grid |