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 /backends.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 'backends.py')
| -rw-r--r-- | backends.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends.py b/backends.py index 19ec9aa..3052ee6 100644 --- a/backends.py +++ b/backends.py @@ -258,9 +258,9 @@ class Backend(): fname = exe.fullpath else: fname = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(t.get_exe()))] - is_cross = self.environment.is_cross_build() + is_cross = self.environment.is_cross_build() and self.environment.cross_info.need_cross_compiler() if is_cross: - exe_wrapper = self.environment.cross_info.get('exe_wrapper', None) + exe_wrapper = self.environment.cross_info.config['binaries'].get('exe_wrapper', None) else: exe_wrapper = None if mesonlib.is_windows(): |