From 17fe6b33735b253e9962dee5f487995cc9ceb687 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Mar 2024 11:08:51 +0530 Subject: [PATCH] Simplify sanitize args --- setup.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index d35d7182b..d9d608264 100755 --- a/setup.py +++ b/setup.py @@ -356,13 +356,7 @@ def get_python_flags(args: Options, cflags: List[str], for_main_executable: bool def get_sanitize_args(cc: List[str], ccver: Tuple[int, int]) -> List[str]: - sanitize_args = ['-fsanitize=address'] - if ccver >= (5, 0): - sanitize_args.append('-fsanitize=undefined') - # if cc == 'gcc' or (cc == 'clang' and ccver >= (4, 2)): - # sanitize_args.append('-fno-sanitize-recover=all') - sanitize_args.append('-fno-omit-frame-pointer') - return sanitize_args + return ['-fsanitize=address,undefined', '-fno-omit-frame-pointer'] def get_binary_arch(path: str) -> BinaryArch: @@ -464,7 +458,7 @@ def init_env( float_conversion = '-Wfloat-conversion' fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' optimize = df if debug or sanitize else '-O3' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else [] cppflags_ = os.environ.get( 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), )