diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-29 00:04:29 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-29 00:04:29 +0300 |
| commit | c12a4c1acaf44ba0c5e74e5723fa3d5ce72a90dd (patch) | |
| tree | 7bed4abe5f5ed39517a62116b65b4c127ecadf3f /compilers.py | |
| parent | b6cb7fd29e289cf01f2ef13ef002a658ccb2d9c8 (diff) | |
| parent | ba92f2126c9bf995a11b07ee8fac771eea153333 (diff) | |
| download | meson-c12a4c1acaf44ba0c5e74e5723fa3d5ce72a90dd.zip meson-c12a4c1acaf44ba0c5e74e5723fa3d5ce72a90dd.tar.gz meson-c12a4c1acaf44ba0c5e74e5723fa3d5ce72a90dd.tar.bz2 | |
Merge pull request #214 from mesonbuild/cross
Merge cross compilation branch.
Diffstat (limited to 'compilers.py')
| -rw-r--r-- | compilers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compilers.py b/compilers.py index 23c260f..38d9b33 100644 --- a/compilers.py +++ b/compilers.py @@ -326,7 +326,7 @@ int main(int argc, char **argv) { varname = 'sizeof ' + element varname = varname.replace(' ', '_') if self.is_cross: - val = env.cross_info.get(varname) + val = env.cross_info.config['properties'][varname] if val is not None: if isinstance(val, int): return val @@ -363,7 +363,7 @@ int main(int argc, char **argv) { varname = 'alignment ' + typename varname = varname.replace(' ', '_') if self.is_cross: - val = env.cross_info.get(varname) + val = env.cross_info.config['properties'][varname] if val is not None: if isinstance(val, int): return val @@ -399,7 +399,7 @@ int main(int argc, char **argv) { varname = 'has function ' + funcname varname = varname.replace(' ', '_') if self.is_cross: - val = env.cross_info.get(varname) + val = env.cross_info.config['properties'].get(varname, None) if val is not None: if isinstance(val, bool): return val |