Fix for build failures - disabling tcmalloc for now

2010-09-21 13:26:52 -04:00 · 2010-09-21 13:26:52 -04:00 · 90e3d83a5c
parent d670fdac29
commit 90e3d83a5c
6564 changed files with 1 additions and 1 deletions
--- a/.hgignore
+++ b/.hgignore
--- a/.hgtags
+++ b/.hgtags
--- a/0
+++ b/0
--- a/build.sh
+++ b/build.sh
--- a/doc/FLOSS-exception.txt
+++ b/doc/FLOSS-exception.txt
--- a/doc/GPL-license.txt
+++ b/doc/GPL-license.txt
--- a/doc/LICENSE-logos.txt
+++ b/doc/LICENSE-logos.txt
--- a/doc/LICENSE-source.txt
+++ b/doc/LICENSE-source.txt
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
--- a/doc/releasenotes-where.txt
+++ b/doc/releasenotes-where.txt
--- a/etc/message.xml
+++ b/etc/message.xml
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
--- a/indra/cmake/CMakeCopyIfDifferent.cmake
+++ b/indra/cmake/CMakeCopyIfDifferent.cmake
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
--- a/indra/cmake/CSharpMacros.cmake
+++ b/indra/cmake/CSharpMacros.cmake
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
--- a/indra/cmake/CopyBackToSource.cmake
+++ b/indra/cmake/CopyBackToSource.cmake
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
--- a/indra/cmake/DragDrop.cmake
+++ b/indra/cmake/DragDrop.cmake
--- a/indra/cmake/ELFIO.cmake
+++ b/indra/cmake/ELFIO.cmake
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
--- a/indra/cmake/ExamplePlugin.cmake
+++ b/indra/cmake/ExamplePlugin.cmake
--- a/indra/cmake/Externals.cmake
+++ b/indra/cmake/Externals.cmake
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
--- a/indra/cmake/FindAPR.cmake
+++ b/indra/cmake/FindAPR.cmake
--- a/indra/cmake/FindBerkeleyDB.cmake
+++ b/indra/cmake/FindBerkeleyDB.cmake
--- a/indra/cmake/FindCARes.cmake
+++ b/indra/cmake/FindCARes.cmake
--- a/indra/cmake/FindELFIO.cmake
+++ b/indra/cmake/FindELFIO.cmake
--- a/indra/cmake/FindGooglePerfTools.cmake
+++ b/indra/cmake/FindGooglePerfTools.cmake
--- a/indra/cmake/FindMT.cmake
+++ b/indra/cmake/FindMT.cmake
--- a/indra/cmake/FindMono.cmake
+++ b/indra/cmake/FindMono.cmake
--- a/indra/cmake/FindMySQL.cmake
+++ b/indra/cmake/FindMySQL.cmake
--- a/indra/cmake/FindOpenJPEG.cmake
+++ b/indra/cmake/FindOpenJPEG.cmake
--- a/indra/cmake/FindSCP.cmake
+++ b/indra/cmake/FindSCP.cmake
--- a/indra/cmake/FindSVN.cmake
+++ b/indra/cmake/FindSVN.cmake
--- a/indra/cmake/FindXmlRpcEpi.cmake
+++ b/indra/cmake/FindXmlRpcEpi.cmake
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
--- a/indra/cmake/GLOD.cmake
+++ b/indra/cmake/GLOD.cmake
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
--- a/indra/cmake/GetPrerequisites_2_8.cmake
+++ b/indra/cmake/GetPrerequisites_2_8.cmake
--- a/indra/cmake/Glui.cmake
+++ b/indra/cmake/Glui.cmake
--- a/indra/cmake/Glut.cmake
+++ b/indra/cmake/Glut.cmake
--- a/indra/cmake/GoogleBreakpad.cmake
+++ b/indra/cmake/GoogleBreakpad.cmake
--- a/indra/cmake/GoogleMock.cmake
+++ b/indra/cmake/GoogleMock.cmake
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@ -33,7 +33,7 @@ if (WINDOWS)
 endif (WINDOWS)

 if (USE_GOOGLE_PERFTOOLS)
-  set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
+  set(TCMALLOC_FLAG -ULL_USE_TCMALLOC=1)
  include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
  set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES})
 else (USE_GOOGLE_PERFTOOLS)
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
--- a/indra/cmake/LLAudio.cmake
+++ b/indra/cmake/LLAudio.cmake
--- a/indra/cmake/LLCharacter.cmake
+++ b/indra/cmake/LLCharacter.cmake
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
--- a/indra/cmake/LLConvexDecomposition.cmake
+++ b/indra/cmake/LLConvexDecomposition.cmake
--- a/indra/cmake/LLCrashLogger.cmake
+++ b/indra/cmake/LLCrashLogger.cmake
--- a/indra/cmake/LLDatabase.cmake
+++ b/indra/cmake/LLDatabase.cmake
--- a/indra/cmake/LLImage.cmake
+++ b/indra/cmake/LLImage.cmake
--- a/indra/cmake/LLImageJ2COJ.cmake
+++ b/indra/cmake/LLImageJ2COJ.cmake
--- a/indra/cmake/LLInventory.cmake
+++ b/indra/cmake/LLInventory.cmake
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
--- a/indra/cmake/LLLogin.cmake
+++ b/indra/cmake/LLLogin.cmake
--- a/indra/cmake/LLMath.cmake
+++ b/indra/cmake/LLMath.cmake
--- a/indra/cmake/LLMessage.cmake
+++ b/indra/cmake/LLMessage.cmake
--- a/indra/cmake/LLPlugin.cmake
+++ b/indra/cmake/LLPlugin.cmake
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
--- a/indra/cmake/LLScene.cmake
+++ b/indra/cmake/LLScene.cmake
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
--- a/indra/cmake/LLTestCommand.cmake
+++ b/indra/cmake/LLTestCommand.cmake
--- a/indra/cmake/LLUI.cmake
+++ b/indra/cmake/LLUI.cmake
--- a/indra/cmake/LLVFS.cmake
+++ b/indra/cmake/LLVFS.cmake
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
--- a/indra/cmake/LLXML.cmake
+++ b/indra/cmake/LLXML.cmake
--- a/indra/cmake/LLXUIXML.cmake
+++ b/indra/cmake/LLXUIXML.cmake
--- a/indra/cmake/LScript.cmake
+++ b/indra/cmake/LScript.cmake
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
--- a/indra/cmake/MediaPluginBase.cmake
+++ b/indra/cmake/MediaPluginBase.cmake
--- a/indra/cmake/MonoDeps.cmake
+++ b/indra/cmake/MonoDeps.cmake
--- a/indra/cmake/MonoEmbed.cmake
+++ b/indra/cmake/MonoEmbed.cmake
--- a/indra/cmake/MySQL.cmake
+++ b/indra/cmake/MySQL.cmake
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
--- a/indra/cmake/PluginAPI.cmake
+++ b/indra/cmake/PluginAPI.cmake
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
--- a/indra/cmake/Pth.cmake
+++ b/indra/cmake/Pth.cmake
--- a/indra/cmake/PulseAudio.cmake
+++ b/indra/cmake/PulseAudio.cmake
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
--- a/indra/cmake/TemplateCheck.cmake
+++ b/indra/cmake/TemplateCheck.cmake
--- a/Show More
+++ b/Show More