From 8748f55f8c49b118425c531fedd7a09a156bb009 Mon Sep 17 00:00:00 2001 From: Drake Arconis <drake@alchemyviewer.org> Date: Fri, 31 Jul 2015 20:57:59 -0400 Subject: [PATCH] Add a switch to make memory-starved machines build less heavily on linux --- indra/cmake/00-Common.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index bf1b0be414..1e7562de55 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -114,6 +114,7 @@ endif (WINDOWS) if (LINUX) + option(CONSERVE_MEMORY "Optimize for memory usage during link stage for memory-starved systems" OFF) set(CMAKE_SKIP_RPATH TRUE) add_definitions( -DLL_LINUX=1 @@ -177,10 +178,10 @@ if (LINUX) set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}") endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") - if (NOT USESYSTEMLIBS AND CMAKE_SIZEOF_VOID_P EQUAL 4) + if (NOT USESYSTEMLIBS AND CMAKE_SIZEOF_VOID_P EQUAL 4 OR CONSERVE_MEMORY) # linking can be very memory-hungry, especially the final viewer link set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") - endif (NOT USESYSTEMLIBS AND CMAKE_SIZEOF_VOID_P EQUAL 4) + endif (NOT USESYSTEMLIBS AND CMAKE_SIZEOF_VOID_P EQUAL 4 OR CONSERVE_MEMORY) endif (LINUX) -- GitLab