Merge pull request #28275 from tchaikov/wip-cmake-asan

ceph.in: do not preload libasan if it is found

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Casey Bodley 2019-05-29 10:44:13 -04:00 committed by GitHub
commit ff5f4a57eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -129,9 +129,8 @@ if os.path.exists(os.path.join(MYPDIR, "CMakeCache.txt")) \
pythonlib_path = os.path.join(lib_path,
"cython_modules",
get_pythonlib_dir())
if asan_lib_path.endswith('NOTFOUND'):
with_asan = False
elif with_seastar and build_type == 'Debug':
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)