summaryrefslogtreecommitdiff
path: root/indra/cmake/00-Common.cmake
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-04 11:44:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-04 11:44:11 +0000
commit05e15ccb82541494bf7145652140de187d838cda (patch)
tree59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/cmake/00-Common.cmake
parent1805369b58d98677c726bb0bcb52618bd66e8fdd (diff)
parent56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff)
merge from viewer2.
Diffstat (limited to 'indra/cmake/00-Common.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 127b62f424..49a1ec7f2c 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -172,8 +172,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)