diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-17 20:07:40 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-17 20:07:40 +0300 |
| commit | 5c5f8c781385d416748000dbdb6f74fa59382340 (patch) | |
| tree | 7e2840d1befa52d6e5e95add4e68013ba7b12f46 /environment.py | |
| parent | 067935ce76c03099abe83998c7c0cb80f64b92f1 (diff) | |
| parent | 77d53c2266ec0d8cb4d2a0da9fae93f0eafb30c7 (diff) | |
| download | meson-5c5f8c781385d416748000dbdb6f74fa59382340.zip meson-5c5f8c781385d416748000dbdb6f74fa59382340.tar.gz meson-5c5f8c781385d416748000dbdb6f74fa59382340.tar.bz2 | |
Merged trunk changes.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/environment.py b/environment.py index 493ee2c..41520d1 100644 --- a/environment.py +++ b/environment.py @@ -189,7 +189,12 @@ class Environment(): return GnuCCompiler(ccache + [compiler], version, GCC_OSX, is_cross, exe_wrap) if (out.startswith('cc') or 'gcc' in out) and \ 'Free Software Foundation' in out: - return GnuCCompiler(ccache + [compiler], version, GCC_STANDARD, is_cross, exe_wrap) + lowerout = out.lower() + if 'mingw' in lowerout or 'msys' in lowerout or 'mingw' in compiler.lower(): + gtype = GCC_MINGW + else: + gtype = GCC_STANDARD + return GnuCCompiler(ccache + [compiler], version, gtype, is_cross, exe_wrap) if 'clang' in out: return ClangCCompiler(ccache + [compiler], version, is_cross, exe_wrap) if 'Microsoft' in out: @@ -308,7 +313,12 @@ class Environment(): return GnuCPPCompiler(ccache + [compiler], version, GCC_OSX, is_cross, exe_wrap) if (out.startswith('c++ ') or 'g++' in out or 'GCC' in out) and \ 'Free Software Foundation' in out: - return GnuCPPCompiler(ccache + [compiler], version, GCC_STANDARD, is_cross, exe_wrap) + lowerout = out.lower() + if 'mingw' in lowerout or 'msys' in lowerout or 'mingw' in compiler.lower(): + gtype = GCC_MINGW + else: + gtype = GCC_STANDARD + return GnuCPPCompiler(ccache + [compiler], version, gtype, is_cross, exe_wrap) if 'clang' in out: return ClangCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap) if 'Microsoft' in out: @@ -622,7 +632,7 @@ class CrossBuildInfo(): for i in res: if not self.ok_type(i): raise EnvironmentException('Malformed value in cross file variable %s.' % varname) - self.items[varname] = res + self.config[s][entry] = res else: raise EnvironmentException('Malformed value in cross file variable %s.' % varname) |