diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-14 23:48:35 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-14 23:48:35 +0200 |
| commit | 926b55076f1fa94f887dd62443c66a886af0b78b (patch) | |
| tree | e194cba0efd5129c09ecc3764ffb686eaa6f54dc | |
| parent | 9fca19c4ebf49e8705a2cc36fd9edfc8dcba946f (diff) | |
| parent | 738da1e413592bafbb268372e27d379db306de79 (diff) | |
| download | meson-926b55076f1fa94f887dd62443c66a886af0b78b.zip meson-926b55076f1fa94f887dd62443c66a886af0b78b.tar.gz meson-926b55076f1fa94f887dd62443c66a886af0b78b.tar.bz2 | |
Merge pull request #354 from minijackson/master
Merged fixes.
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | ninjabackend.py | 2 | ||||
| -rw-r--r-- | optinterpreter.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/authors.txt b/authors.txt index ccb8e83..0d043eb 100644 --- a/authors.txt +++ b/authors.txt @@ -26,3 +26,4 @@ Haakon Sporsheim Wink Saville Yoav Alon Martin Ejdestig +Rémi Nicole diff --git a/ninjabackend.py b/ninjabackend.py index 98cc579..c818f1d 100644 --- a/ninjabackend.py +++ b/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() diff --git a/optinterpreter.py b/optinterpreter.py index f111610..672df51 100644 --- a/optinterpreter.py +++ b/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.') |