TCMalloc can now be manually disabled via develop.py -DDISABLE_TCMALLOC:BOOL=ON

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)

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)")
 

indra/develop.py

@@ -788,7 +788,8 @@ Command-options for "configure":
   -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!)
+  -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:

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;
 }