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

Merge pull request #354 from minijackson/master 

Merged fixes.
This commit is contained in:
Jussi Pakkanen 2016-01-14 23:48:35 +02:00
parent 9fca19c4eb 738da1e413
commit 926b55076f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
authors.txt
View File

@ -26,3 +26,4 @@ Haakon Sporsheim
Wink Saville Wink Saville
Yoav Alon Yoav Alon
Martin Ejdestig Martin Ejdestig
Rémi Nicole

2
ninjabackend.py
View File

@ -1740,7 +1740,7 @@ rule FORTRAN_DEP_HACK
gcno_elem.add_item('COMMAND', [sys.executable, clean_script, '.', 'gcno']) gcno_elem.add_item('COMMAND', [sys.executable, clean_script, '.', 'gcno'])
gcno_elem.add_item('description', 'Deleting gcno files') gcno_elem.add_item('description', 'Deleting gcno files')
gcno_elem.write(outfile) gcno_elem.write(outfile)
self.check_outputs(gcno_elem, gcno_elem) self.check_outputs(gcno_elem)
gcda_elem = NinjaBuildElement('clean-gcda', 'CUSTOM_COMMAND', 'PHONY') gcda_elem = NinjaBuildElement('clean-gcda', 'CUSTOM_COMMAND', 'PHONY')
script_root = self.environment.get_script_dir() script_root = self.environment.get_script_dir()

2
optinterpreter.py
View File

@ -100,7 +100,7 @@ class OptionInterpreter:
elif isinstance(arg, mparser.ArrayNode): elif isinstance(arg, mparser.ArrayNode):
return [self.reduce_single(curarg) for curarg in arg.args.arguments] return [self.reduce_single(curarg) for curarg in arg.args.arguments]
elif isinstance(arg, mparser.NumberNode): elif isinstance(arg, mparser.NumberNode):
return arg.get_value() return arg.value
else: else:
raise OptionException('Arguments may only be string, int, bool, or array of those.') raise OptionException('Arguments may only be string, int, bool, or array of those.')