perf build python: Don't leave a.out file when building with clang
Ian Rogers
reviewerPATCH v2 1/1 perf build python: Don't leave a.out file when building with clang
Testing clang features doesn't specify a "-o" option so an a.out file is created and left in the make directory (not the output). Fix this by specifying a "-o" of "/dev/null". Reorganize the code a little to help with readability.
Signed-off-by Ian Rogers <[email protected]>
Tested-by Justin Stitt <[email protected]>
---
v2: Resolve merge conflict with:c6a43bc3e8f6 perf python: split Clang options when invoking Popen
--- tools/perf/util/setup.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
tools/perf/util/setup.py +10 -3
@@ -23,10 +23,17 @@ assert srctree, "Environment variable srctree, for the Linux sources, not set" src_feature_tests = f'{srctree}/tools/build/feature' def clang_has_option(option): - cmd = shlex.split(f"{cc} {cc_options} {option}") - cmd.append(path.join(src_feature_tests, "test-hello.c")) + error_substrings = ( + b"unknown argument", + b"is not supported", + b"unknown warning option" + ) + cmd = shlex.split(f"{cc} {cc_options} {option}") + [ + "-o", "/dev/null", + path.join(src_feature_tests, "test-hello.c") + ] cc_output = Popen(cmd, stderr=PIPE).stderr.readlines() - return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o) or (b"unknown warning option" in o))] == [ ] + return not any(any(error in line for error in error_substrings) for line in cc_output) if cc_is_clang: from sysconfig import get_config_vars
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Quoted 7 lines · Ian Rogers
Testing clang features doesn't specify a "-o" option so an a.out file is created and left in the make directory (not the output). Fix this by specifying a "-o" of "
/dev/null". Reorganize the code a little to help with readability.Signed-off-by Ian Rogers <[email protected]>Tested-by Justin Stitt <[email protected]>
Applied to perf-tools-next, thanks!
Best regards,
Namhyung