diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-16 23:02:09 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-16 23:02:09 +0300 |
| commit | c58dd64f8e947f4659bcbc47d75e86e65043e714 (patch) | |
| tree | 28be176b2646b02ae6cc006a00608a1152db35be /mesonbuild/environment.py | |
| parent | fa6ca160548d7e8df9c4c724e6c96f5e004e5316 (diff) | |
| parent | 7f8908336362cccd45516f48b5320380cec0e817 (diff) | |
| download | meson-c58dd64f8e947f4659bcbc47d75e86e65043e714.zip meson-c58dd64f8e947f4659bcbc47d75e86e65043e714.tar.gz meson-c58dd64f8e947f4659bcbc47d75e86e65043e714.tar.bz2 | |
Merged Arm CC support.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index cd8d92c..6920b8d 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -38,6 +38,8 @@ from .compilers import ( is_source, ) from .compilers import ( + ArmCCompiler, + ArmCPPCompiler, ClangCCompiler, ClangCPPCompiler, ClangObjCCompiler, @@ -519,6 +521,8 @@ class Environment: if found_cl in watcom_cls: continue arg = '/?' + elif 'armcc' in compiler[0]: + arg = '--vsn' else: arg = '--version' try: @@ -577,6 +581,9 @@ class Environment: inteltype = ICC_STANDARD cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler return cls(ccache + compiler, version, inteltype, is_cross, exe_wrap, full_version=full_version) + if 'ARM' in out: + cls = ArmCCompiler if lang == 'c' else ArmCPPCompiler + return cls(ccache + compiler, version, is_cross, exe_wrap, full_version=full_version) self._handle_exceptions(popen_exceptions, compilers) def detect_c_compiler(self, want_cross): |