From 23c533566f33e8508aa8a94f9dcb7666ccef0b47 Mon Sep 17 00:00:00 2001 From: "Morten V. Pedersen" Date: Wed, 18 Dec 2019 11:24:32 +0100 Subject: [PATCH 1/2] Fix detection of build context when a custom context is used --- waflib/extras/clang_compilation_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waflib/extras/clang_compilation_database.py b/waflib/extras/clang_compilation_database.py index 1398b0af..2c8747dc 100644 --- a/waflib/extras/clang_compilation_database.py +++ b/waflib/extras/clang_compilation_database.py @@ -123,7 +123,7 @@ def patch_execute(): """ Invoke clangdb command before build """ - if type(self) == Build.BuildContext: + if isinstance(self, Build.BuildContext): Scripting.run_command('clangdb') old_execute_build(self) From 6467070a1f216f303325902e2ab864790650c6d6 Mon Sep 17 00:00:00 2001 From: "Morten V. Pedersen" Date: Thu, 2 Jan 2020 14:47:39 +0100 Subject: [PATCH 2/2] Using suggested self.cmd.startswith approach --- waflib/extras/clang_compilation_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waflib/extras/clang_compilation_database.py b/waflib/extras/clang_compilation_database.py index 2c8747dc..ff71f22e 100644 --- a/waflib/extras/clang_compilation_database.py +++ b/waflib/extras/clang_compilation_database.py @@ -123,7 +123,7 @@ def patch_execute(): """ Invoke clangdb command before build """ - if isinstance(self, Build.BuildContext): + if self.cmd.startswith('build'): Scripting.run_command('clangdb') old_execute_build(self)