aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2021-12-16 17:08:26 -0500
committerBen Boeckel <ben.boeckel@kitware.com>2021-12-16 17:08:26 -0500
commit786d4379824a370b3a6ea415dc48aadb3b1f9dd2 (patch)
tree8109ed0b4a22f27eec49aee905033ce00d436481
parent28de74c9944bdbdf18ffccc91d2d96a0cd4ade48 (diff)
downloadmeson-786d4379824a370b3a6ea415dc48aadb3b1f9dd2.zip
meson-786d4379824a370b3a6ea415dc48aadb3b1f9dd2.tar.gz
meson-786d4379824a370b3a6ea415dc48aadb3b1f9dd2.tar.bz2
armclang: extend the prefix detection for Keil armclang
This will avoid false positives with the ARM Ltd. `armclang` compiler.
-rw-r--r--mesonbuild/build.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 6515f42..9fc31c6 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1777,8 +1777,8 @@ class Executable(BuildTarget):
self.suffix = 'exe'
elif machine.system.startswith('wasm') or machine.system == 'emscripten':
self.suffix = 'js'
- elif ('c' in self.compilers and self.compilers['c'].get_id().startswith('arm') or
- 'cpp' in self.compilers and self.compilers['cpp'].get_id().startswith('arm')):
+ elif ('c' in self.compilers and self.compilers['c'].get_id().startswith('armclang') or
+ 'cpp' in self.compilers and self.compilers['cpp'].get_id().startswith('armclang')):
self.suffix = 'axf'
elif ('c' in self.compilers and self.compilers['c'].get_id().startswith('ccrx') or
'cpp' in self.compilers and self.compilers['cpp'].get_id().startswith('ccrx')):