From 35e809fc5e7c06e46753722bff03b491b6223df9 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 2 Nov 2019 19:50:54 +0200 Subject: Store run target names in build. This way we can easily check that we only provide builtin targets such as clang-format if the user has not provided their own. --- mesonbuild/backend/ninjabackend.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mesonbuild/backend/ninjabackend.py') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 49fb312..50ac44f 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2648,6 +2648,8 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) def generate_scanbuild(self): if not environment.detect_scanbuild(): return + if ('', 'scan-build') in self.build.run_target_names: + return cmd = self.environment.get_build_command() + \ ['--internal', 'scanbuild', self.environment.source_dir, self.environment.build_dir] + \ self.environment.get_build_command() + self.get_user_option_args() @@ -2665,6 +2667,8 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) return if target_name in self.all_outputs: return + if ('', target_name) in self.build.run_target_names: + return cmd = self.environment.get_build_command() + \ ['--internal', 'clang' + name, self.environment.source_dir, self.environment.build_dir] elem = NinjaBuildElement(self.all_outputs, 'meson-' + target_name, 'CUSTOM_COMMAND', 'PHONY') @@ -2688,6 +2692,8 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) import shutil if not shutil.which(tool): return + if ('', target_name) in self.build.run_target_names: + return if target_name in self.all_outputs: return cmd = self.environment.get_build_command() + \ -- cgit v1.1