From a2f200c5d68ae9eb7d914065028253d56cc1e3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 31 Mar 2025 15:37:47 +0200
Subject: [PATCH] SCons: Only set GCC `-Wvirtual-inheritance` for C++ and
 `warnings=extra`

---
 SConstruct | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/SConstruct b/SConstruct
index 65a293c00ef..7c8f4c4e775 100644
--- a/SConstruct
+++ b/SConstruct
@@ -862,12 +862,7 @@ else:  # GCC, Clang
     common_warnings = []
 
     if methods.using_gcc(env):
-        common_warnings += [
-            "-Wshadow",
-            "-Wno-misleading-indentation",
-            # For optimized Object::cast_to / object.inherits_from()
-            "-Wvirtual-inheritance",
-        ]
+        common_warnings += ["-Wshadow", "-Wno-misleading-indentation"]
         if cc_version_major < 11:
             # Regression in GCC 9/10, spams so much in our variadic templates
             # that we need to outright disable it.
@@ -895,7 +890,7 @@ else:  # GCC, Clang
                     "-Wstringop-overflow=4",
                 ]
             )
-            env.Append(CXXFLAGS=["-Wplacement-new=1"])
+            env.Append(CXXFLAGS=["-Wplacement-new=1", "-Wvirtual-inheritance"])
             # Need to fix a warning with AudioServer lambdas before enabling.
             # if cc_version_major != 9:  # GCC 9 had a regression (GH-36325).
             #    env.Append(CXXFLAGS=["-Wnoexcept"])