From d88223bd615ebce49cc662a3b48461de9c4780bc Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Mon, 22 Feb 2016 21:07:03 +0200
Subject: Do delayed argument setting properly this time.

---
 mesonbuild/interpreter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mesonbuild/interpreter.py')

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 4d41f1a..b64eb7f 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1331,7 +1331,7 @@ class Interpreter():
             key, value = option.split('=', 1)
             builtin_options = self.coredata.builtin_options
             if key in builtin_options:
-                if not hasattr(self.environment.cmd_line_options, value):
+                if not self.environment.had_argument_for(key):
                     self.coredata.set_builtin_option(key, value)
                 # If this was set on the command line, do not override.
             else:
-- 
cgit v1.1