diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-01-19 18:36:21 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-19 18:36:21 -0800 |
| commit | 154ed186eab7f6e57601cf7e08c927f3a860a9d8 (patch) | |
| tree | c31869ce5e1df43e6dcdd2052db15f4ba36201d7 /indra/cmake | |
| parent | fe637c5f9571e91c8e90440a0677e5c40b7bf648 (diff) | |
| parent | d82ca578941a985fb2361ccdc4120aeeb22f82a7 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/cmake')
| -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 98eeed09b3..9db0f4fff8 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") + set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory,FORCE:MULTIPLE") endif (NOT STANDALONE) endif (VIEWER) |