ceph-*-setup: use default allocator for crimson flavor

since we've merged https://github.com/ceph/ceph/pull/37887

This reverts commit 3aa35a92b466212c0c3c715781a8aab8a5e0136c.

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index f7c2c1b75a94c9c875a69ef78b744d3b933ef440..2828855fd4baf88b53e35ce4b3e6534e68a3ca99 100644 (file)
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -79,7 +79,7 @@ case "${FLAVOR}" in
     crimson)
         echo "Detected crimson flavor: will use flag: -DWITH_SEASTAR=ON"
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON -DSeastar_CXX_FLAGS=-DSEASTAR_DEFAULT_ALLOCATOR"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
         ;;
     *)
         echo "unknown FLAVOR: ${FLAVOR}" >&2

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 3700d370cc27ed8b5fe7f6b36b5a1c1500c53d1e..f377a213404199459c1d5e84599561eec2866a61 100644 (file)
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -50,7 +50,7 @@ case "${FLAVOR}" in
         ;;
     crimson)
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON -DSeastar_CXX_FLAGS=-DSEASTAR_DEFAULT_ALLOCATOR"
+        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DWITH_SEASTAR=ON"
         ;;
     *)
         echo "unknown FLAVOR: ${FLAVOR}" >&2