Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Grab base options from the command line.

This commit is contained in:
Jussi Pakkanen 2016-03-20 20:43:32 +02:00
parent 79de463993
commit a405f7a499
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/interpreter.py
View File

@ -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])

1
mesonbuild/mconf.py
View File

@ -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)