From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jun 2016 18:06:02 +0000 (-0400)
Subject: build-auto.sh: set cmake variable too
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=71d02e8b2c9bd3533c44b3bf0408681ed7890248;p=autobuild-ceph.git

build-auto.sh: set cmake variable too

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/build-auto.sh b/build-auto.sh
index 586cdbd..9e76f3a 100755
--- a/build-auto.sh
+++ b/build-auto.sh
@@ -3,6 +3,7 @@
 mydir='/srv/autobuild-ceph'
 
 export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --without-cryptopp"
+export CEPH_EXTRA_CMAKE_ARGS
 
 if ! hostname | grep -q ^gitbuilder- ; then
     echo "hostname "`hostname`"does not make sense to me; i fail"
@@ -10,13 +11,15 @@ if ! hostname | grep -q ^gitbuilder- ; then
 fi
 
 if hostname | grep -q -- -notcmalloc ; then
-    echo "hostname has -notcmalloc, will build --without-tcmalloc --without-cryptopp"
+    echo "hostname has -notcmalloc"
     export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --without-tcmalloc"
+    export CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc"
 else
     export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --with-tcmalloc"
+    export CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
 fi
 if hostname | grep -q -- -gcov ; then
-    echo "hostname has -gcov, will --enable-coverage"
+    echo "hostname has -gcov"
     export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --enable-coverage"
 fi