From bf18e8529afc96590ee96c4d5f3c75de89ae7e63 Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg@mysql.com>
Date: Sun, 3 Oct 2010 18:24:45 +0200
Subject: [PATCH] Fix bug#56267: tcmalloc lib (libtcmalloc_minimal.so) is
missing from mysql 5.5 binary
Ensure that a "-DMALLOC_LIB=/foo/bar/libtcmalloc_minimal.so"
will ensure that this library gets included in the tar.gz
binary package.
It depends on the build environment to set this variable
to the correct path name, if it is available.
---
scripts/CMakeLists.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 0c9177c79c..9b4b598a68 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -81,12 +81,11 @@ INSTALL(FILES
)
# TCMalloc hacks
-IF($ENV{MALLOC_LIB})
- SET(MALLOC_LIB $ENV{MALLOC_LIB} CACHE STRING "malloc library")
-ENDIF()
-
IF(MALLOC_LIB)
- INSTALL(FILES ${MALLOC_LIB} DESTINATION lib OPTIONAL)
+ MESSAGE("Using tcmalloc '${MALLOC_LIB}'")
+ INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
+ELSE()
+ MESSAGE("No 'MALLOC_LIB' variable")
ENDIF()
IF(CMAKE_GENERATOR MATCHES "Makefiles")
--
2.30.9