Suppress enum-enum conversion warning on Linux cross compilers

We now only support GCC 11+, so we can remove the conditional flag inclusion.
wpilibsuite · Dec 7, 2024 · 1bc792e · 1bc792e
1 parent b9c6572
commit 1bc792e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ java {
 
 allprojects {
     group = "edu.wpi.first"
-    version = "2025.8.0"
+    version = "2025.9.0"
 
     if (project.hasProperty('publishVersion')) {
         version = project.publishVersion

diff --git a/src/main/java/edu/wpi/first/nativeutils/WPINativeUtilsExtension.java b/src/main/java/edu/wpi/first/nativeutils/WPINativeUtilsExtension.java
@@ -56,11 +56,9 @@ public static class DefaultArguments {
 
         public final String unixSymbolArg = "-g";
 
-        // -Wdeprecated-enum-enum-conversion was introduced in GCC 11
         public final List<String> linuxCrossCompilerArgs = List.of("-std=c++20", "-Wformat=2", "-pedantic",
-                "-Wno-psabi", "-Wno-unused-parameter", "-fPIC", "-pthread");
-        public final List<String> linuxCrossCompilerExtraArgs11 = List.of("-Wno-error=deprecated-enum-enum-conversion");
-        public final List<String> linuxCrossCompilerExtraArgs10 = List.of("-Wno-error=deprecated-declarations");
+                "-Wno-psabi", "-Wno-unused-parameter", "-Wno-error=deprecated-enum-enum-conversion", "-fPIC",
+                "-pthread");
         public final List<String> linuxCrossCCompilerArgs = List.of("-Wformat=2", "-pedantic", "-Wno-psabi",
                 "-Wno-unused-parameter", "-fPIC", "-pthread");
         public final List<String> linuxCrossLinkerArgs = List.of("-rdynamic", "-pthread", "-ldl", "-latomic", "-Wl,-rpath,'$ORIGIN'");
@@ -115,13 +113,8 @@ public static class Platforms {
     private final Map<String, PlatformConfig> windowsPlatforms = new HashMap<>();
     private final Map<String, PlatformConfig> unixPlatforms = new HashMap<>();
 
-    public void addLinuxCrossArgs(PlatformConfig platform, int gccMajor) {
+    public void addLinuxCrossArgs(PlatformConfig platform) {
         platform.getCppCompiler().getArgs().addAll(defaultArguments.linuxCrossCompilerArgs);
-        if (gccMajor >= 11) {
-            platform.getCppCompiler().getArgs().addAll(defaultArguments.linuxCrossCompilerExtraArgs11);
-        } else {
-            platform.getCppCompiler().getArgs().addAll(defaultArguments.linuxCrossCompilerExtraArgs10);
-        }
         platform.getcCompiler().getArgs().addAll(defaultArguments.linuxCrossCCompilerArgs);
         platform.getLinker().getArgs().addAll(defaultArguments.linuxCrossLinkerArgs);
         platform.getCppCompiler().getDebugArgs().addAll(defaultArguments.linuxCrossDebugCompilerArgs);
@@ -229,16 +222,16 @@ public WPINativeUtilsExtension(NativeUtilsExtension nativeExt, Project project)
         unixPlatforms.put(platforms.systemcore, linuxsystemcore);
 
         linuxathena.getPlatformPath().set("linux/athena");
-        addLinuxCrossArgs(linuxathena, 12);
+        addLinuxCrossArgs(linuxathena);
 
         linuxsystemcore.getPlatformPath().set("linux/systemcore");
-        addLinuxCrossArgs(linuxsystemcore, 12);
+        addLinuxCrossArgs(linuxsystemcore);
 
         linuxarm32.getPlatformPath().set("linux/arm32");
-        addLinuxCrossArgs(linuxarm32, 10);
+        addLinuxCrossArgs(linuxarm32);
 
         linuxarm64.getPlatformPath().set("linux/arm64");
-        addLinuxCrossArgs(linuxarm64, 10);
+        addLinuxCrossArgs(linuxarm64);
 
         windowsx86.getPlatformPath().set("windows/x86");
         addWindowsArgs(windowsx86);
@@ -256,13 +249,6 @@ public WPINativeUtilsExtension(NativeUtilsExtension nativeExt, Project project)
         addMacArgs(osxuniversal);
     }
 
-    public void addGcc11CrossArgs(String platform) {
-        PlatformConfig config = unixPlatforms.get(platform);
-        if (config != null) {
-            config.getCppCompiler().getArgs().addAll(defaultArguments.linuxCrossCompilerExtraArgs11);
-        }
-    }
-
     public void addMacMinimumVersionArg() {
         PlatformConfig platform = unixPlatforms.get(platforms.osxuniversal);
         platform.getcCompiler().getArgs().add(defaultArguments.macMinimumVersionArg);

diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle
@@ -3,7 +3,7 @@ import edu.wpi.first.nativeutils.vendordeps.WPIVendorDepsPlugin
 
 plugins {
     id "cpp"
-    id "edu.wpi.first.NativeUtils" version "2025.8.0"
+    id "edu.wpi.first.NativeUtils" version "2025.9.0"
 }
 
 nativeUtils.addWpiNativeUtils()