Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow for 3-component ACfL versions

Browse Source
pull/10477/head
Stepan Nassyr 3 years ago committed by Dylan Baker
parent a49cd00d64
commit d045c9f79d
1 changed files with 26 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      mesonbuild/compilers/detect.py

34
mesonbuild/compilers/detect.py
Unescape View File

@ -477,11 +477,20 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
exe_wrap, linker=linker, full_version=full_version)
if 'Arm C/C++/Fortran Compiler' in out:
version = ''
arm_ver_match = re.search(r'version (\d+)\.(\d+) \(build number (\d+)\)', out)
arm_ver_major = arm_ver_match.group(1)
arm_ver_minor = arm_ver_match.group(2)
arm_ver_build = arm_ver_match.group(3)
version = '.'.join([arm_ver_major, arm_ver_minor, arm_ver_build])
if arm_ver_match:
arm_ver_major = arm_ver_match.group(1)
arm_ver_minor = arm_ver_match.group(2)
arm_ver_build = arm_ver_match.group(3)
version = '.'.join([arm_ver_major, arm_ver_minor, arm_ver_build])
else:
arm_ver_match = re.search(r'version (\d+)\.(\d+)\.(\d+) \(build number (\d+)\)', out)
arm_ver_major = arm_ver_match.group(1)
arm_ver_minor = arm_ver_match.group(2)
arm_ver_patch = arm_ver_match.group(3)
arm_ver_build = arm_ver_match.group(4)
version = '.'.join([arm_ver_major, arm_ver_minor, arm_ver_patch, arm_ver_build])
if lang == 'c':
cls = ArmLtdClangCCompiler
elif lang == 'cpp':
@ -747,11 +756,20 @@ def detect_fortran_compiler(env: 'Environment', for_machine: MachineChoice) -> C
if 'Arm C/C++/Fortran Compiler' in out:
cls = ArmLtdFlangFortranCompiler
version = ''
arm_ver_match = re.search(r'version (\d+)\.(\d+) \(build number (\d+)\)', out)
arm_ver_major = arm_ver_match.group(1)
arm_ver_minor = arm_ver_match.group(2)
arm_ver_build = arm_ver_match.group(3)
version = '.'.join([arm_ver_major, arm_ver_minor, arm_ver_build])
if arm_ver_match:
arm_ver_major = arm_ver_match.group(1)
arm_ver_minor = arm_ver_match.group(2)
arm_ver_build = arm_ver_match.group(3)
version = '.'.join([arm_ver_major, arm_ver_minor, arm_ver_build])
else:
arm_ver_match = re.search(r'version (\d+)\.(\d+)\.(\d+) \(build number (\d+)\)', out)
arm_ver_major = arm_ver_match.group(1)
arm_ver_minor = arm_ver_match.group(2)
arm_ver_patch = arm_ver_match.group(3)
arm_ver_build = arm_ver_match.group(4)
version = '.'.join([arm_ver_major, arm_ver_minor, arm_ver_patch, arm_ver_build])
linker = guess_nix_linker(env, compiler, cls, version, for_machine)
return cls(
ccache + compiler, version, for_machine, is_cross, info,

Write Preview
Loading…
Cancel
Save