diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-20 06:45:12 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-21 01:36:08 +0530 |
| commit | 798c349e35f5f7b740ce83360c7f59188a96bd28 (patch) | |
| tree | 95268981476774909b44b8f1fc2983bec839dbc5 /mesonbuild/environment.py | |
| parent | de45535b7dacbf4903322c3a670dadb2c5e53102 (diff) | |
| download | meson-798c349e35f5f7b740ce83360c7f59188a96bd28.zip meson-798c349e35f5f7b740ce83360c7f59188a96bd28.tar.gz meson-798c349e35f5f7b740ce83360c7f59188a96bd28.tar.bz2 | |
Fix compiler exelist in cross-info and the environment
https://github.com/mesonbuild/meson/pull/1406 had an incomplete fix
for this. The test case caught it.
Note: this still doesn't test that setting it in the cross-info works,
but it's the same codepath as via the environment so it should be ok.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 405be0e..3021770 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -373,7 +373,7 @@ class Environment: C, C++, ObjC, ObjC++, Fortran so consolidate it here. ''' if self.is_cross_build() and want_cross: - compilers = mesonlib.stringlistify(self.cross_info.config['binaries'][lang]) + compilers = [mesonlib.stringlistify(self.cross_info.config['binaries'][lang])] ccache = [] is_cross = True if self.cross_info.need_exe_wrapper(): @@ -381,7 +381,7 @@ class Environment: else: exe_wrap = [] elif evar in os.environ: - compilers = shlex.split(os.environ[evar]) + compilers = [shlex.split(os.environ[evar])] ccache = [] is_cross = False exe_wrap = None |