diff --git a/build.gradle b/build.gradle index 72b009d..22398e1 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ targetCompatibility = 11 allprojects { group = "edu.wpi.first" - version = "2024.3.0" + version = "2024.3.1" 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 index 937039c..2523502 100644 --- a/src/main/java/edu/wpi/first/nativeutils/WPINativeUtilsExtension.java +++ b/src/main/java/edu/wpi/first/nativeutils/WPINativeUtilsExtension.java @@ -60,6 +60,7 @@ public static class DefaultArguments { public final List linuxCrossCompilerArgs = List.of("-std=c++20", "-Wformat=2", "-pedantic", "-Wno-psabi", "-Wno-unused-parameter", "-fPIC", "-pthread"); public final List linuxCrossCompilerExtraArgs11 = List.of("-Wno-error=deprecated-enum-enum-conversion"); + public final List linuxCrossCompilerExtraArgs10 = List.of("-Wno-error=deprecated-declarations"); public final List linuxCrossCCompilerArgs = List.of("-Wformat=2", "-pedantic", "-Wno-psabi", "-Wno-unused-parameter", "-fPIC", "-pthread"); public final List linuxCrossLinkerArgs = List.of("-rdynamic", "-pthread", "-ldl", "-latomic"); @@ -116,6 +117,8 @@ public void addLinuxCrossArgs(PlatformConfig platform, int gccMajor) { 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); diff --git a/testing/cpp/build.gradle b/testing/cpp/build.gradle index e2cc478..347336c 100644 --- a/testing/cpp/build.gradle +++ b/testing/cpp/build.gradle @@ -2,7 +2,7 @@ import edu.wpi.first.toolchain.NativePlatforms plugins { id "cpp" - id "edu.wpi.first.NativeUtils" version "2024.3.0" + id "edu.wpi.first.NativeUtils" version "2024.3.1" } nativeUtils.addWpiNativeUtils()