diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
commit | 76cf7ebf7037c2e579861c64c38fc24bde165669 (patch) | |
tree | 72152ff4ae4cb5f6422cd8c4c9830b4f76c3aa21 /indra/cmake | |
parent | d2d192060993d938a2fd131f8872a60b678e4a04 (diff) | |
parent | 9a15ee8a91a12020b22625873c280837739f946c (diff) |
merge
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/00-Common.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 1f578eec5f..592e9fc901 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -171,8 +171,8 @@ if (LINUX) if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) - # linking can be so slow - give us a chance to figure out why - set(CMAKE_CXX_LINK_FLAGS "-Wl,--stats,--no-keep-memory") + # linking can be very memory-hungry, especially the final viewer link + set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") endif (NOT STANDALONE) endif (VIEWER) |