update cxxStandard determination for C++20

zawata · zawata · commit 461962a70d5a · 2025-02-05T15:42:07.000-07:00
diff --git a/utils/defaultCxxStandard.js b/utils/defaultCxxStandard.js
@@ -1,18 +1,24 @@
 const targetSpecified = process.argv[2] !== 'none';
 
-let isNode18OrElectron20AndUp = false;
+let cxxStandard = '14';
+
 if (targetSpecified) {
   // Assume electron if target is specified.
   // If building node 18 / 19 via target, will need to specify C++ standard manually
   const majorVersion = process.argv[2].split('.')[0];
-  isNode18OrElectron20AndUp = majorVersion >= 20;
+  if (Number.parseInt(majorVersion) >= 32) {
+    cxxStandard = '20';
+  } else if (Number.parseInt(majorVersion) >= 21) {
+    cxxStandard = '17';
+  }
 } else {
+  const abiVersion = Number.parseInt(process.versions.modules) ?? 0;
   // Node 18 === 108
-  isNode18OrElectron20AndUp = Number.parseInt(process.versions.modules) >= 108;
+  if (abiVersion >= 131) {
+    cxxStandard = '20';
+  } else if (abiVersion >= 108) {
+    cxxStandard = '17';
+  }
 }
 
-const defaultCxxStandard = isNode18OrElectron20AndUp
-  ? '17'
-  : '14';
-
-process.stdout.write(defaultCxxStandard);
+process.stdout.write(cxxStandard);
