Merge pull request #10750 from ceph/wip-14799-hammer

hammer: rocksdb do not link against tcmalloc if it's disabled Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Aug 17, 2016 · eb27865 · eb27865
2 parents 08277b7 + 5248929
commit eb27865
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -466,7 +466,7 @@ done
 %endif
 
 ./autogen.sh
-MY_CONF_OPT=""
+MY_CONF_OPT="$CEPH_EXTRA_CONFIGURE_ARGS"
 
 MY_CONF_OPT="$MY_CONF_OPT --with-radosgw"
 

diff --git a/src/rocksdb b/src/rocksdb