aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/compilers.py
diff options
context:
space:
mode:
authorMohammed Amer Khalidi <mohammedamer.khalidi@cirrus.com>2018-09-28 11:59:51 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2018-10-07 19:21:26 +0300
commit18204b8ed6a19c4ac8b2405da87513b878282f45 (patch)
treefc445d79b0593163662c1be815707756ad8d5449 /mesonbuild/compilers/compilers.py
parentc0236e10f36448703ca2f85689aaa880810d93c6 (diff)
downloadmeson-18204b8ed6a19c4ac8b2405da87513b878282f45.zip
meson-18204b8ed6a19c4ac8b2405da87513b878282f45.tar.gz
meson-18204b8ed6a19c4ac8b2405da87513b878282f45.tar.bz2
Adding "compiler_type" flag to ARM compilers.
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
-rw-r--r--mesonbuild/compilers/compilers.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 26aeba7..97bfa38 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1191,6 +1191,8 @@ class CompilerType(enum.Enum):
ICC_OSX = 21
ICC_WIN = 22
+ ARM_WIN = 30
+
@property
def is_standard_compiler(self):
return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD')
@@ -1201,7 +1203,7 @@ class CompilerType(enum.Enum):
@property
def is_windows_compiler(self):
- return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN')
+ return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN')
def get_macos_dylib_install_name(prefix, shlib_name, suffix, soversion):
@@ -1542,7 +1544,7 @@ class ClangCompiler(GnuLikeCompiler):
class ArmclangCompiler:
- def __init__(self):
+ def __init__(self, compiler_type):
if not self.is_cross:
raise EnvironmentException('armclang supports only cross-compilation.')
# Check whether 'armlink.exe' is available in path
@@ -1568,6 +1570,7 @@ class ArmclangCompiler:
if not version_compare(self.version, '==' + linker_ver):
raise EnvironmentException('armlink version does not match with compiler version')
self.id = 'armclang'
+ self.compiler_type = compiler_type
self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage',
'b_ndebug', 'b_staticpic', 'b_colorout']
# Assembly
@@ -1654,10 +1657,11 @@ class IntelCompiler(GnuLikeCompiler):
class ArmCompiler:
# Functionality that is common to all ARM family compilers.
- def __init__(self):
+ def __init__(self, compiler_type):
if not self.is_cross:
raise EnvironmentException('armcc supports only cross-compilation.')
self.id = 'arm'
+ self.compiler_type = compiler_type
default_warn_args = []
self.warn_args = {'1': default_warn_args,
'2': default_warn_args + [],