diff options
| author | Aaron Stone <stone@lindenlab.com> | 2011-07-15 16:26:15 -0700 |
|---|---|---|
| committer | Aaron Stone <stone@lindenlab.com> | 2011-07-15 16:26:15 -0700 |
| commit | 14a06fd1c843c033bd670fad4f6b83d18d5107c1 (patch) | |
| tree | 33adf2829ce51427f6edbd24d4fbbef21215cd11 /indra/cmake | |
| parent | 5f99d30c20bd4e23d17bbf78d2112f21ee840169 (diff) | |
| parent | fc5aaf5df8d3b064c05539c7b6911a4c3f4dc1c7 (diff) | |
Merge for STORM-1482
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2c974fb4ff..0266239454 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -171,7 +171,10 @@ if (LINUX) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. add_definitions(-DLL_IGNORE_SIGCHLD) - add_definitions(-march=pentium4 -mfpmath=sse) + if (WORD_SIZE EQUAL 32) + add_definitions(-march=pentium4) + endif (WORD_SIZE EQUAL 32) + add_definitions(-mfpmath=sse) #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime |