diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-20 11:41:59 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-20 11:41:59 -0500 |
| commit | a912a5e23daad7d17ed336595284a2e4e2bdd027 (patch) | |
| tree | 654301ec2715e0df9ed1299ef3723dc152ad406e /indra | |
| parent | 31b8a14827f269fe7b54364ca5c37226b08c6930 (diff) | |
| parent | 3dafd81173f492938c0083b20fe8e3f6362b4866 (diff) | |
Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 9db0f4fff8..98eeed09b3 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -180,7 +180,7 @@ if (LINUX) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) # linking can be very memory-hungry, especially the final viewer link - set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory,FORCE:MULTIPLE") + set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") endif (NOT STANDALONE) endif (VIEWER) |