From e244e546866ca2b6e456cf9a2eb1cdc234816660 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Wed, 8 Aug 2018 08:07:55 +0300
Subject: [PATCH] Addition to prev. revision [#CLICKHOUSE-2]

---
 ci/jobs/quick-build/run.sh                 | 2 +-
 libs/libcommon/cmake/find_gperftools.cmake | 8 +-------
 release                                    | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/ci/jobs/quick-build/run.sh b/ci/jobs/quick-build/run.sh
index 0eefa72caa7..6a948c560ee 100755
--- a/ci/jobs/quick-build/run.sh
+++ b/ci/jobs/quick-build/run.sh
@@ -21,7 +21,7 @@ BUILD_TARGETS=clickhouse
 BUILD_TYPE=Debug
 ENABLE_EMBEDDED_COMPILER=0
 
-CMAKE_FLAGS="-D CMAKE_C_FLAGS_ADD=-g0 -D CMAKE_CXX_FLAGS_ADD=-g0 -D ENABLE_TCMALLOC=0 -D ENABLE_CAPNP=0 -D ENABLE_RDKAFKA=0 -D ENABLE_UNWIND=0 -D ENABLE_ICU=0 -D ENABLE_POCO_MONGODB=0 -D ENABLE_POCO_NETSSL=0 -D ENABLE_POCO_ODBC=0 -D ENABLE_ODBC=0 -D ENABLE_MYSQL=0"
+CMAKE_FLAGS="-D CMAKE_C_FLAGS_ADD=-g0 -D CMAKE_CXX_FLAGS_ADD=-g0 -D ENABLE_JEMALLOC=0 -D ENABLE_CAPNP=0 -D ENABLE_RDKAFKA=0 -D ENABLE_UNWIND=0 -D ENABLE_ICU=0 -D ENABLE_POCO_MONGODB=0 -D ENABLE_POCO_NETSSL=0 -D ENABLE_POCO_ODBC=0 -D ENABLE_ODBC=0 -D ENABLE_MYSQL=0"
 
 [[ $(uname) == "FreeBSD" ]] && COMPILER_PACKAGE_VERSION=devel && export COMPILER_PATH=/usr/local/bin
 
diff --git a/libs/libcommon/cmake/find_gperftools.cmake b/libs/libcommon/cmake/find_gperftools.cmake
index 889181a30c2..73e8182d390 100644
--- a/libs/libcommon/cmake/find_gperftools.cmake
+++ b/libs/libcommon/cmake/find_gperftools.cmake
@@ -1,16 +1,10 @@
-if (OS_LINUX AND NOT SANITIZE)
-    set(ENABLE_TCMALLOC_DEFAULT 1)
-else ()
-    set(ENABLE_TCMALLOC_DEFAULT 0)
-endif ()
-
 if (OS_FREEBSD OR ARCH_32)
     option (USE_INTERNAL_GPERFTOOLS_LIBRARY "Set to FALSE to use system gperftools (tcmalloc) library instead of bundled" OFF)
 else ()
     option (USE_INTERNAL_GPERFTOOLS_LIBRARY "Set to FALSE to use system gperftools (tcmalloc) library instead of bundled" ${NOT_UNBUNDLED})
 endif ()
 
-option (ENABLE_TCMALLOC "Set to TRUE to enable tcmalloc" ${ENABLE_TCMALLOC_DEFAULT})
+option (ENABLE_TCMALLOC "Set to TRUE to enable tcmalloc" OFF)
 option (DEBUG_TCMALLOC "Set to TRUE to use debug version of libtcmalloc" OFF)
 
 if (ENABLE_TCMALLOC)
diff --git a/release b/release
index 9a20261b6fc..c250815b307 100755
--- a/release
+++ b/release
@@ -71,7 +71,6 @@ done
 # Build options
 if [ -n "$SANITIZER" ]
 then
-    CMAKE_BUILD_TYPE=$SANITIZER
     VERSION_POSTFIX+="+${SANITIZER,,}"
     export DEB_CC=${DEB_CC=clang-6.0}
     export DEB_CXX=${DEB_CXX=clang++-6.0}
@@ -84,7 +83,7 @@ elif [[ $BUILD_TYPE == 'debug' ]]; then
     VERSION_POSTFIX+=+$BUILD_TYPE
 fi
 
-CMAKE_FLAGS=" $MALLOC_OPTS -DENABLE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"
+CMAKE_FLAGS=" $MALLOC_OPTS -DSANITIZE=$SANITIZER -DENABLE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"
 [[ -n "$CMAKE_BUILD_TYPE" ]] && CMAKE_FLAGS=" -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE $CMAKE_FLAGS"
 #[[ "$CMAKE_FLAGS" =~ "USE_INTERNAL_LLVM_LIBRARY" ]] || CMAKE_FLAGS=" -DUSE_INTERNAL_LLVM_LIBRARY=1 $CMAKE_FLAGS"