From 7533b475beca4988443e3bd12d5e99e160c78dad Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 16 Oct 2012 17:15:23 -0500
Subject: [PATCH] TCMalloc can now be manually disabled via develop.py
 -DDISABLE_TCMALLOC:BOOL=ON

---
 indra/cmake/GooglePerfTools.cmake |  4 ++--
 indra/cmake/Variables.cmake       |  1 +
 indra/develop.py                  | 15 ++++++++-------
 indra/newview/sgmemstat.cpp       |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index c102542e0..3ad669c94 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -11,10 +11,10 @@ else (STANDALONE)
   if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
     use_prebuilt_binary(gperftools)
   endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
-  if (WINDOWS)
+  if (WINDOWS AND NOT DISABLE_TCMALLOC)
     set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
     set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
-  endif (WINDOWS)
+  endif (WINDOWS AND NOT DISABLE_TCMALLOC)
   if (LINUX)
     if(USE_GOOGLE_PERFTOOLS)
       set(TCMALLOC_LIBRARIES tcmalloc)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index c6035597f..9e7d411a2 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -30,6 +30,7 @@ set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX})
 set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
 set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
 set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
+set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)")
 set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
 set(VISTA_ICON OFF CACHE BOOL "Allow vista icon with pre 2008 Visual Studio IDEs. (Assumes replacement old rcdll.dll with new rcdll.dll from win sdk 7.0 or later)")
 
diff --git a/indra/develop.py b/indra/develop.py
index 5e94ca125..a38758d39 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -782,13 +782,14 @@ Commands:
 
 Command-options for "configure":
   We use cmake variables to change the build configuration.
-  -DSERVER:BOOL=OFF        Don't configure simulator/dataserver/etc
-  -DVIEWER:BOOL=OFF        Don't configure the viewer
-  -DPACKAGE:BOOL=ON        Create "package" target to make installers
-  -DLOCALIZESETUP:BOOL=ON  Create one win_setup target per supported language
-  -DLL_TESTS:BOOL=OFF      Don't generate unit test projects
-  -DEXAMPLEPLUGIN:BOOL=OFF Don't generate example plugin project
-  -VISTA_ICON:BOOL=ON      Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!)
+  -DSERVER:BOOL=OFF          Don't configure simulator/dataserver/etc
+  -DVIEWER:BOOL=OFF          Don't configure the viewer
+  -DPACKAGE:BOOL=ON          Create "package" target to make installers
+  -DLOCALIZESETUP:BOOL=ON    Create one win_setup target per supported language
+  -DLL_TESTS:BOOL=OFF        Don't generate unit test projects
+  -DEXAMPLEPLUGIN:BOOL=OFF   Don't generate example plugin project
+  -DDISABLE_TCMALLOC:BOOL=ON Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)
+  -DVISTA_ICON:BOOL=ON       Allow pre-2008 VS to use vista-optimized resource file. (Requires updated rcdll.dll!)
 
 Examples:
   Set up a viewer-only project for your system:
diff --git a/indra/newview/sgmemstat.cpp b/indra/newview/sgmemstat.cpp
index d4e22a882..d8c4a3f5a 100644
--- a/indra/newview/sgmemstat.cpp
+++ b/indra/newview/sgmemstat.cpp
@@ -18,7 +18,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "sgmemstat.h"
 
-#if (!LL_WINDOWS && !LL_LINUX)
+#if (!(LL_LINUX || LL_USE_TCMALLOC))
 bool SGMemStat::haveStat() {
 	return false;
 }