diff options
| author | Mohammed Amer Khalidi <mohammedamer.khalidi@cirrus.com> | 2018-09-28 11:59:51 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-07 19:21:26 +0300 |
| commit | 18204b8ed6a19c4ac8b2405da87513b878282f45 (patch) | |
| tree | fc445d79b0593163662c1be815707756ad8d5449 /mesonbuild/environment.py | |
| parent | c0236e10f36448703ca2f85689aaa880810d93c6 (diff) | |
| download | meson-18204b8ed6a19c4ac8b2405da87513b878282f45.zip meson-18204b8ed6a19c4ac8b2405da87513b878282f45.tar.gz meson-18204b8ed6a19c4ac8b2405da87513b878282f45.tar.bz2 | |
Adding "compiler_type" flag to ARM compilers.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index f01ba38..e872ba7 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -590,8 +590,9 @@ This is probably wrong, it should always point to the native compiler.''' % evar # Override previous values version = search_version(arm_ver_str) full_version = arm_ver_str + compiler_type = CompilerType.ARM_WIN cls = ArmclangCCompiler if lang == 'c' else ArmclangCPPCompiler - return cls(ccache + compiler, version, is_cross, exe_wrap, full_version=full_version) + return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version) if 'clang' in out: if 'Apple' in out or mesonlib.for_darwin(want_cross, self): compiler_type = CompilerType.CLANG_OSX @@ -626,8 +627,9 @@ This is probably wrong, it should always point to the native compiler.''' % evar cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version) if 'ARM' in out: + compiler_type = CompilerType.ARM_WIN cls = ArmCCompiler if lang == 'c' else ArmCPPCompiler - return cls(ccache + compiler, version, is_cross, exe_wrap, full_version=full_version) + return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version) self._handle_exceptions(popen_exceptions, compilers) def detect_c_compiler(self, want_cross): |