diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 23:16:42 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 23:16:42 +0300 |
commit | e6a868e533724aeeb0e8450d511f30c7f8f22f6d (patch) | |
tree | 9a60a3442c2cb2bfba9ef36e632602e12249e44f /interpreter.py | |
parent | 24d23c3086afe687cc93b26a07f504902f4a0b02 (diff) | |
parent | 78739afd9c75fd0b7265536c41922abe7be7a8e4 (diff) | |
download | meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.zip meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.tar.gz meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.tar.bz2 |
Merge pull request #229 from mesonbuild/crossname
Use system() instead of name() which is a confusing term.
Diffstat (limited to 'interpreter.py')
-rw-r--r-- | interpreter.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/interpreter.py b/interpreter.py index bc2f6f3..3443058 100644 --- a/interpreter.py +++ b/interpreter.py @@ -305,7 +305,7 @@ class GeneratedListHolder(InterpreterObject): class BuildMachine(InterpreterObject): def __init__(self): InterpreterObject.__init__(self) - self.methods.update({'name' : self.name_method, + self.methods.update({'system' : self.system_method, 'cpu' : self.cpu_method, 'endian' : self.endian_method, }) @@ -326,7 +326,7 @@ class BuildMachine(InterpreterObject): # Add fixes here as bugs are reported. return trial - def name_method(self, args, kwargs): + def system_method(self, args, kwargs): return platform.system().lower() def endian_method(self, args, kwargs): @@ -338,13 +338,13 @@ class CrossMachineInfo(InterpreterObject): def __init__(self, cross_info): InterpreterObject.__init__(self) self.info = cross_info - self.methods.update({'name' : self.name_method, + self.methods.update({'system' : self.system_method, 'cpu' : self.cpu_method, 'endian' : self.endian_method, }) - def name_method(self, args, kwargs): - return self.info['name'] + def system_method(self, args, kwargs): + return self.info['system'] def cpu_method(self, args, kwargs): return self.info['cpu'] |