aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-04-27 11:11:22 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2018-04-27 11:19:12 -0400
commit6de68e520141f73088f8b8aaeb39abc59661da6d (patch)
tree87517f8129e759d41ffb4871a9688f6ba03dae90 /mesonbuild/environment.py
parent5970f1be3c5299851f4e2c7e70e3f8c9975391ab (diff)
downloadmeson-6de68e520141f73088f8b8aaeb39abc59661da6d.zip
meson-6de68e520141f73088f8b8aaeb39abc59661da6d.tar.gz
meson-6de68e520141f73088f8b8aaeb39abc59661da6d.tar.bz2
Passing --default-library=both should override project value
Looks like this has always been broken, had_argument_for() was checking if we have --default_library instead of --default-library.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 6920b8d..15b3737 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -373,7 +373,7 @@ class Environment:
return is_library(fname)
def had_argument_for(self, option):
- trial1 = '--' + option
+ trial1 = coredata.get_builtin_option_cmdline_name(option)
trial2 = '-D' + option
previous_is_plaind = False
for i in self.original_cmd_line_args: