From ce8d164e05b255ef6a23f74b9b313a463e7c245f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 29 Oct 2020 17:00:06 +0800 Subject: [PATCH] ceph-*-setup: use default allocator for crimson flavor since we've merged https://github.com/ceph/ceph/pull/37887 This reverts commit 3aa35a92b466212c0c3c715781a8aab8a5e0136c. --- ceph-dev-new-setup/build/build | 2 +- ceph-dev-setup/build/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build index f7c2c1b7..2828855f 100644 --- 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 3700d370..f377a213 100644 --- 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 -- 2.39.5