From 6de68e520141f73088f8b8aaeb39abc59661da6d Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Fri, 27 Apr 2018 11:11:22 -0400
Subject: 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.
---
 mesonbuild/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mesonbuild/environment.py')

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:
-- 
cgit v1.1