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 <kchai@redhat.com>
(cherry picked from commit 26d9fa5cab52e64150e0ce153a3caf7683914e6e)

diff --git a/src/ceph.in b/src/ceph.in
index b97d9332a92c890a3267b6903610adb365b1e83e..64c900dcd9e911d040af444bea489eaf515cb697 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -111,9 +111,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
@@ -125,9 +124,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)