Bläddra i källkod

Merge pull request #91833 from akien-mga/scons-min-gcc-version-9

SCons: Bump minimum supported GCC version to GCC 9
Rémi Verschelde 1 år sedan
förälder
incheckning
5ae85fc6ab
1 ändrade filer med 5 tillägg och 15 borttagningar
  1. 5 15
      SConstruct

+ 5 - 15
SConstruct

@@ -614,22 +614,12 @@ if methods.using_gcc(env):
             "Couldn't detect compiler version, skipping version checks. "
             "Couldn't detect compiler version, skipping version checks. "
             "Build may fail if the compiler doesn't support C++17 fully."
             "Build may fail if the compiler doesn't support C++17 fully."
         )
         )
-    # 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
-    elif cc_version_major == 8 and cc_version_minor < 4:
+    elif cc_version_major < 9:
         print_error(
         print_error(
-            "Detected GCC 8 version < 8.4, which is not supported due to a "
-            "regression in its C++17 guaranteed copy elision support. Use a "
-            'newer GCC version, or Clang 6 or later by passing "use_llvm=yes" '
-            "to the SCons command line."
-        )
-        Exit(255)
-    elif cc_version_major < 7:
-        print_error(
-            "Detected GCC version older than 7, which does not fully support "
-            "C++17. Supported versions are GCC 7, 9 and later. Use a newer GCC "
-            'version, or Clang 6 or later by passing "use_llvm=yes" to the '
-            "SCons command line."
+            "Detected GCC version older than 9, which does not fully support "
+            "C++17, or has bugs when compiling Godot. Supported versions are 9 "
+            "and later. Use a newer GCC version, or Clang 6 or later by passing "
+            '"use_llvm=yes" to the SCons command line.'
         )
         )
         Exit(255)
         Exit(255)
     elif cc_version_metadata1 == "win32":
     elif cc_version_metadata1 == "win32":