diff options
| -rw-r--r-- | mesonbuild/scripts/clangformat.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/scripts/clangformat.py b/mesonbuild/scripts/clangformat.py index 9dc54665a..f2f6a779b 100644 --- a/mesonbuild/scripts/clangformat.py +++ b/mesonbuild/scripts/clangformat.py @@ -18,17 +18,25 @@ from pathlib import Path from .run_tool import run_tool from ..environment import detect_clangformat +from ..mesonlib import version_compare +from ..programs import ExternalProgram import typing as T def run_clang_format(fname: Path, exelist: T.List[str], check: bool) -> subprocess.CompletedProcess: + clangformat_10 = False if check: - original = fname.read_bytes() + cformat_ver = ExternalProgram('clang-format', exelist).get_version() + if version_compare(cformat_ver, '>=10'): + clangformat_10 = True + exelist = exelist + ['--dry-run', '--Werror'] + else: + original = fname.read_bytes() before = fname.stat().st_mtime ret = subprocess.run(exelist + ['-style=file', '-i', str(fname)]) after = fname.stat().st_mtime if before != after: print('File reformatted: ', fname) - if check: + if check and not clangformat_10: # Restore the original if only checking. fname.write_bytes(original) ret.returncode = 1 |