diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-09-30 00:07:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-30 00:07:32 +0300 |
| commit | 1473fbc3f6c412ef83a9a96c8b6df5f60571fc3c (patch) | |
| tree | a183b2c0eb3a2f7ce85e8c9bd8bf6a2d2afd6707 /mesonbuild/backend/ninjabackend.py | |
| parent | 0008b326ffc39c86be2ae4352bdddc03f01840cc (diff) | |
| parent | 24bd0294372d388160d3b093407d6f0db9aa5481 (diff) | |
| download | meson-1473fbc3f6c412ef83a9a96c8b6df5f60571fc3c.zip meson-1473fbc3f6c412ef83a9a96c8b6df5f60571fc3c.tar.gz meson-1473fbc3f6c412ef83a9a96c8b6df5f60571fc3c.tar.bz2 | |
Merge pull request #5939 from lantw44/move-the-list-of-llvm-versions-to-a-common-place
Move the list of LLVM versions to a common place
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8315ab1..c960727 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2657,9 +2657,8 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) self.create_target_alias('meson-scan-build') def generate_clangformat(self): - import shutil target_name = 'clang-format' - if shutil.which('clang-format') is None: + if not environment.detect_clangformat(): return if not os.path.exists(os.path.join(self.environment.source_dir, '.clang-format')) and \ not os.path.exists(os.path.join(self.environment.source_dir, '_clang-format')): |