diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-26 09:54:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 09:54:36 +0100 |
| commit | fc5a400ce28c600da6ff4c40941e81d8ee588e53 (patch) | |
| tree | a40211280bad62589d582b6162a9f41df48e31d4 /methods.py | |
| parent | 412d1f20d1dfda7aef5a8a313bec4ad08e866786 (diff) | |
| parent | dd4eb5494f7a9a2bd6a29b430a6741da49c51b03 (diff) | |
Merge pull request #36550 from akien-mga/scons-compiler-version-check
SCons: Re-allow upcoming GCC 8.4, fixes C++17 copy elision
Diffstat (limited to 'methods.py')
| -rw-r--r-- | methods.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/methods.py b/methods.py index 5fdcc2c4b4..2e858e3865 100644 --- a/methods.py +++ b/methods.py @@ -557,6 +557,10 @@ def is_vanilla_clang(env): def get_compiler_version(env): + """ + Returns an array of version numbers as strings: [major, minor, patch]. + The return array should have at least two values (major, minor). + """ if using_gcc(env): version = decode_utf8(subprocess.check_output([env['CXX'], '-dumpversion']).strip()) elif using_clang(env): @@ -564,7 +568,7 @@ def get_compiler_version(env): version = decode_utf8(subprocess.check_output([env['CXX'], '--version']).strip()) else: # TODO: Implement for MSVC return None - match = re.search('[0-9][0-9.]*', version) + match = re.search('[0-9]+\.[0-9.]*', version) if match is not None: return match.group().split('.') else: |