godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SConstruct
View File

@ -334,15 +334,16 @@ if selected_platform in platform_list:
# Enforce our minimal compiler version requirements # Enforce our minimal compiler version requirements
version = methods.get_compiler_version(env) version = methods.get_compiler_version(env)
major = int(version[0]) if version is not None else -1 if version is not None and methods.using_gcc(env):
if methods.using_gcc(env): major = int(version[0])
# GCC 8 has a regression in the support of guaranteed copy elision minor = int(version[1])
# GCC 8 before 8.4 has a regression in the support of guaranteed copy elision
# which causes a build failure: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86521 # which causes a build failure: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86521
if major == 8: if major == 8 and minor < 4:
print("Detected GCC version 8, which is not supported due to a regression " print("Detected GCC 8 version < 8.4, which is not supported due to a "
"in its C++17 guaranteed copy elision support. Use a newer GCC " "regression in its C++17 guaranteed copy elision support. Use a "
"version, or Clang 6 or later by passing \"use_llvm=yes\" to the " "newer GCC version, or Clang 6 or later by passing \"use_llvm=yes\" "
"SCons command line.") "to the SCons command line.")
sys.exit(255) sys.exit(255)
elif major < 7: elif major < 7:
print("Detected GCC version older than 7, which does not fully support " print("Detected GCC version older than 7, which does not fully support "
@ -350,7 +351,8 @@ if selected_platform in platform_list:
"version, or Clang 6 or later by passing \"use_llvm=yes\" to the " "version, or Clang 6 or later by passing \"use_llvm=yes\" to the "
"SCons command line.") "SCons command line.")
sys.exit(255) sys.exit(255)
elif methods.using_clang(env): elif version is not None and methods.using_clang(env):
major = int(version[0])
# Apple LLVM versions differ from upstream LLVM version \o/, compare # Apple LLVM versions differ from upstream LLVM version \o/, compare
# in https://en.wikipedia.org/wiki/Xcode#Toolchain_versions # in https://en.wikipedia.org/wiki/Xcode#Toolchain_versions
if env["platform"] == "osx" or env["platform"] == "iphone": if env["platform"] == "osx" or env["platform"] == "iphone":

6
methods.py
View File

@ -557,6 +557,10 @@ def is_vanilla_clang(env):
def get_compiler_version(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): if using_gcc(env):
version = decode_utf8(subprocess.check_output([env['CXX'], '-dumpversion']).strip()) version = decode_utf8(subprocess.check_output([env['CXX'], '-dumpversion']).strip())
elif using_clang(env): elif using_clang(env):
@ -564,7 +568,7 @@ def get_compiler_version(env):
version = decode_utf8(subprocess.check_output([env['CXX'], '--version']).strip()) version = decode_utf8(subprocess.check_output([env['CXX'], '--version']).strip())
else: # TODO: Implement for MSVC else: # TODO: Implement for MSVC
return None return None
match = re.search('[0-9][0-9.]*', version) match = re.search('[0-9]+\.[0-9.]*', version)
if match is not None: if match is not None:
return match.group().split('.') return match.group().split('.')
else: else: