Fix clang version detection regexes (#2549)

microsoft · May 24, 2022 · 5c1fc3f · 5c1fc3f
1 parent fda9640
commit 5c1fc3f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/drivers/cmakeDriver.ts b/src/drivers/cmakeDriver.ts
@@ -1017,28 +1017,29 @@ export abstract class CMakeDriver implements vscode.Disposable {
             captureGroup: 1
         },
         // clang -v: clang version 10.0.0-4ubuntu1
+        // or        clang version 5.0.0 (tags/RELEASE_500/final)
         {
             name: "clang",
             versionSwitch: "-v",
-            versionOutputRegexp: "(Apple LLVM|clang) version (.*)- ",
+            versionOutputRegexp: "(Apple LLVM|clang) version ([^\\s-]+)",
             captureGroup: 2
         },
         {
             name: "clang-cl",
             versionSwitch: "-v",
-            versionOutputRegexp: "(Apple LLVM|clang) version (.*)- ",
+            versionOutputRegexp: "(Apple LLVM|clang) version ([^\\s-]+)",
             captureGroup: 2
         },
         {
             name: "clang++",
             versionSwitch: "-v",
-            versionOutputRegexp: "(Apple LLVM|clang) version (.*)- ",
+            versionOutputRegexp: "(Apple LLVM|clang) version ([^\\s-]+)",
             captureGroup: 2
         },
         {
             name: "armclang",
             versionSwitch: "-v",
-            versionOutputRegexp: "(Apple LLVM|clang) version (.*)- ",
+            versionOutputRegexp: "(Apple LLVM|clang) version ([^\\s-]+)",
             captureGroup: 2
         },
         {