]> git.apps.os.sepia.ceph.com Git - autobuild-ceph.git/commitdiff
build-auto.sh: set cmake variable too
authorSage Weil <sage@redhat.com>
Tue, 21 Jun 2016 18:06:02 +0000 (14:06 -0400)
committerSage Weil <sage@redhat.com>
Tue, 21 Jun 2016 18:06:02 +0000 (14:06 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
build-auto.sh

index 586cdbd59ec573823ae92df6a21a419f19e82d45..9e76f3ac983eaa78fbf5f6f314e3970ada6c8276 100755 (executable)
@@ -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