Merge pull request #354 from minijackson/master

Merged fixes.

authors.txt

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

ninjabackend.py

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

optinterpreter.py

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