godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

SCons: Re-allow upcoming GCC 8.4, fixes C++17 copy elision

Browse Source 
Follow-up to #36484.

The patches for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86521 have now
landed in the `releases/gcc-8` branch and will be in GCC 8.4.
This commit is contained in:
Rémi Verschelde
2020-02-26 07:46:44 +01:00
parent 2d980f6f13
commit dd4eb5494f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
methods.py
View File

@@ -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: