diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 20:43:32 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 20:43:32 +0200 |
| commit | a405f7a4994d7823b0e4429438e78a6b3dadecdc (patch) | |
| tree | e9a6ad263fe2a83e8821ed3f9bccd42eeafec7a1 | |
| parent | 79de463993fb8201edd389df1626fec841f403d6 (diff) | |
| download | meson-a405f7a4994d7823b0e4429438e78a6b3dadecdc.zip meson-a405f7a4994d7823b0e4429438e78a6b3dadecdc.tar.gz meson-a405f7a4994d7823b0e4429438e78a6b3dadecdc.tar.bz2 | |
Grab base options from the command line.
| -rw-r--r-- | mesonbuild/interpreter.py | 8 | ||||
| -rw-r--r-- | mesonbuild/mconf.py | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 39546b5..4b8fe0b 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1528,10 +1528,16 @@ class Interpreter(): return success def add_base_options(self, compiler): + proj_opt = self.environment.cmd_line_options.projectoptions for optname in compiler.base_options: if optname in self.coredata.base_options: continue - self.coredata.base_options[optname] = compilers.base_options[optname] + oobj = compilers.base_options[optname] + for po in proj_opt: + if po.startswith(optname + '='): + oobj.set_value(po.split('=', 1)[1]) + break + self.coredata.base_options[optname] = oobj def func_find_program(self, node, args, kwargs): self.validate_arguments(args, 1, [str]) diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py index a5a4a9f..2d5560c 100644 --- a/mesonbuild/mconf.py +++ b/mesonbuild/mconf.py @@ -128,7 +128,6 @@ class Conf: carr.append(['warning_level', 'Warning level', self.coredata.get_builtin_option('warning_level'), warning_levels]) carr.append(['werror', 'Treat warnings as errors', self.coredata.get_builtin_option('werror'), booleans]) carr.append(['strip', 'Strip on install', self.coredata.get_builtin_option('strip'), booleans]) - carr.append(['use_pch', 'Precompiled headers', self.coredata.get_builtin_option('use_pch'), booleans]) carr.append(['unity', 'Unity build', self.coredata.get_builtin_option('unity'), booleans]) carr.append(['default_library', 'Default library type', self.coredata.get_builtin_option('default_library'), libtypelist]) self.print_aligned(carr) |