aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-07-01 11:53:45 -0700
committerJussi Pakkanen <jpakkane@gmail.com>2021-07-02 17:18:02 +0300
commit210065ffe8c158e0bd53b775e8fe0f009845b747 (patch)
tree8a2e4bbec4b4bd058104721c712821ef54d67435
parent971a0b1775ef80fc0877b3b90f75803f197c866b (diff)
downloadmeson-210065ffe8c158e0bd53b775e8fe0f009845b747.zip
meson-210065ffe8c158e0bd53b775e8fe0f009845b747.tar.gz
meson-210065ffe8c158e0bd53b775e8fe0f009845b747.tar.bz2
backends/ninja: only pass project specific arguments to scan-build
Currently all arguments are being passed to scan-build as part of the refactoring of how Meson internally handles arguments, but that's wrong, only project specific arguments are supposed to be passed. Fixes: #8818
-rw-r--r--mesonbuild/backend/ninjabackend.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index d6b535b..44e5228 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -3103,7 +3103,8 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
def get_user_option_args(self):
cmds = []
for (k, v) in self.environment.coredata.options.items():
- cmds.append('-D' + str(k) + '=' + (v.value if isinstance(v.value, str) else str(v.value).lower()))
+ if k.is_project():
+ cmds.append('-D' + str(k) + '=' + (v.value if isinstance(v.value, str) else str(v.value).lower()))
# The order of these arguments must be the same between runs of Meson
# to ensure reproducible output. The order we pass them shouldn't
# affect behavior in any other way.