summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-11 10:09:23 -0800
committerJames Cook <james@lindenlab.com>2010-02-11 10:09:23 -0800
commit9dd7924b19651abf393f7b0dee632904a6b8e52a (patch)
treeb22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/cmake
parent301f250c1cd77711c0234d8ed4089453712f834e (diff)
parent39fe664b97b946daf7984b946fede6f04ae731c4 (diff)
Merge
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/00-Common.cmake4
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)