diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-10-03 18:24:45 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-10-03 18:24:45 +0200 |
| commit | 7cb89424f984bf3299b596a0e512591f4390a9c2 (patch) | |
| tree | c8cde36c6ce76640fe60303dda17c39cdc8b39d2 /scripts | |
| parent | 76f4cfde66303514b1929acfe01e78a31943f71d (diff) | |
| download | mariadb-git-7cb89424f984bf3299b596a0e512591f4390a9c2.tar.gz | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 0c9177c79c5..9b4b598a682 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") |