processing-cpp
diff --git a/‎mode/CppMode.jar‎
181 Bytes b/‎mode/CppMode.jar‎
181 Bytes
diff --git a/‎src/java/CppBuild.java‎
Lines changed: 7 additions & 3 deletions b/‎src/java/CppBuild.java‎
Lines changed: 7 additions & 3 deletions
@@ -2998,9 +2998,12 @@ private List<String> wordWrap(String line, int max) {
     return r;
   }
 
-  /** Returns the best -std=c++XX flag supported by the given g++ binary. */
+  /** Returns the best -std=c++XX flag supported by the given g++ binary. Cached per binary. */
+  private static final java.util.concurrent.ConcurrentHashMap<String,String> _stdCache
+      = new java.util.concurrent.ConcurrentHashMap<>();
   static String bestCppStd(String gpp) {
-    for (String std : new String[]{"c++2c", "c++23", "c++20", "c++17"}) {
+    return _stdCache.computeIfAbsent(gpp, g -> {
+      for (String std : new String[]{"c++2c", "c++23", "c++20", "c++17"}) {
       try {
         ProcessBuilder pb = new ProcessBuilder(gpp, "-std=" + std, "-x", "c++", "-fsyntax-only", "-");
         pb.redirectErrorStream(true);
@@ -3013,7 +3016,8 @@ static String bestCppStd(String gpp) {
         }
       } catch (Exception ignored) {}
     }
-    return "c++17";
+      return "c++17";
+    });
   }
 
   private List<String> buildCommand(String gpp, File src, File bin, boolean win, boolean mac) {
Original file line number	Diff line number	Diff line change
`@@ -2998,9 +2998,12 @@ private List<String> wordWrap(String line, int max) {`
`2998`	`2998`	`return r;`
`2999`	`2999`	`}`
`3000`	`3000`
`3001`		`- /** Returns the best -std=c++XX flag supported by the given g++ binary. */`
	`3001`	`+ /** Returns the best -std=c++XX flag supported by the given g++ binary. Cached per binary. */`
	`3002`	`+ private static final java.util.concurrent.ConcurrentHashMap<String,String> _stdCache`
	`3003`	`+ = new java.util.concurrent.ConcurrentHashMap<>();`
`3002`	`3004`	`static String bestCppStd(String gpp) {`
`3003`		`- for (String std : new String[]{"c++2c", "c++23", "c++20", "c++17"}) {`
	`3005`	`+ return _stdCache.computeIfAbsent(gpp, g -> {`
	`3006`	`+ for (String std : new String[]{"c++2c", "c++23", "c++20", "c++17"}) {`
`3004`	`3007`	`try {`
`3005`	`3008`	`ProcessBuilder pb = new ProcessBuilder(gpp, "-std=" + std, "-x", "c++", "-fsyntax-only", "-");`
`3006`	`3009`	`pb.redirectErrorStream(true);`
`@@ -3013,7 +3016,8 @@ static String bestCppStd(String gpp) {`
`3013`	`3016`	`}`
`3014`	`3017`	`} catch (Exception ignored) {}`
`3015`	`3018`	`}`
`3016`		`- return "c++17";`
	`3019`	`+ return "c++17";`
	`3020`	`+ });`
`3017`	`3021`	`}`
`3018`	`3022`
`3019`	`3023`	`private List<String> buildCommand(String gpp, File src, File bin, boolean win, boolean mac) {`