From 26d9fa5cab52e64150e0ce153a3caf7683914e6e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 22 Jun 2019 11:59:59 +0800 Subject: [PATCH] ceph.in: do not preload asan even if not needed if ceph python bindings are compiled with ASan enabled has nothing to do with Seastar. so no need to check for Seastar related compiling settings. Signed-off-by: Kefu Chai --- src/ceph.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ceph.in b/src/ceph.in index 0f734c158da..78529616820 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -115,9 +115,8 @@ def get_cmake_variables(*names): if os.path.exists(os.path.join(MYPDIR, "CMakeCache.txt")) \ and os.path.exists(os.path.join(MYPDIR, "bin/init-ceph")): - src_path, build_type, with_seastar, with_asan, asan_lib_path = \ - get_cmake_variables("ceph_SOURCE_DIR", "CMAKE_BUILD_TYPE", - "WITH_SEASTAR", "WITH_ASAN", "ASAN_LIBRARY") + src_path, with_asan, asan_lib_path = \ + get_cmake_variables("ceph_SOURCE_DIR", "WITH_ASAN", "ASAN_LIBRARY") if src_path is None: # Huh, maybe we're not really in a cmake environment? pass @@ -129,9 +128,6 @@ if os.path.exists(os.path.join(MYPDIR, "CMakeCache.txt")) \ pythonlib_path = os.path.join(lib_path, "cython_modules", get_pythonlib_dir()) - if (with_seastar and build_type == 'Debug' and - not asan_lib_path.endswith('NOTFOUND')): - with_asan = True respawn_in_path(lib_path, pybind_path, pythonlib_path, asan_lib_path if with_asan else None) -- 2.39.5