Fix CXX compiler path in cmake-kits.json file

Adds getCxxCompilerPath command, to provide correct path to g++ executable

Fixes #107

Author: will-v-pi

package.json

@@ -117,6 +117,12 @@
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.getCxxCompilerPath",
+        "title": "Get C++ compiler path",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.getChip",
         "title": "Get Chip",

scripts/pico_project.py

@@ -901,7 +901,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
         "name": "Pico",
         "compilers": {{
             "C": "${{command:raspberry-pi-pico.getCompilerPath}}",
-            "CXX": "${{command:raspberry-pi-pico.getCompilerPath}}"
+            "CXX": "${{command:raspberry-pi-pico.getCxxCompilerPath}}"
         }},
         "environmentVariables": {{
             "PATH": "${{command:raspberry-pi-pico.getEnvPath}};${{env:PATH}}"

src/commands/getPaths.mts

@@ -149,6 +149,44 @@ export class GetCompilerPathCommand extends CommandWithResult<string> {
   }
 }
 
+export class GetCxxCompilerPathCommand extends CommandWithResult<string> {
+  constructor() {
+    super("getCxxCompilerPath");
+  }
+
+  async execute(): Promise<string> {
+    if (
+      workspace.workspaceFolders === undefined ||
+      workspace.workspaceFolders.length === 0
+    ) {
+      return "";
+    }
+
+    const workspaceFolder = workspace.workspaceFolders?.[0];
+
+    const selectedToolchainAndSDKVersions =
+      await cmakeGetSelectedToolchainAndSDKVersions(workspaceFolder.uri);
+    if (selectedToolchainAndSDKVersions === null) {
+      return "";
+    }
+    const toolchainVersion = selectedToolchainAndSDKVersions[1];
+
+    let triple = "arm-none-eabi";
+    if (toolchainVersion.includes("RISCV")) {
+      if (toolchainVersion.includes("COREV")) {
+        triple = "riscv32-corev-elf";
+      } else {
+        triple = "riscv32-unknown-elf";
+      }
+    }
+
+    return join(
+      buildToolchainPath(toolchainVersion), "bin",
+      triple + `-g++${process.platform === "win32" ? ".exe" : ""}`
+    );
+  }
+}
+
 export class GetChipCommand extends CommandWithResult<string> {
   constructor() {
     super("getChip");

src/extension.mts

@@ -37,6 +37,7 @@ import {
   GetEnvPathCommand,
   GetGDBPathCommand,
   GetCompilerPathCommand,
+  GetCxxCompilerPathCommand,
   GetChipCommand,
   GetTargetCommand,
   GetChipUppercaseCommand,
@@ -108,6 +109,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     new GetEnvPathCommand(),
     new GetGDBPathCommand(),
     new GetCompilerPathCommand(),
+    new GetCxxCompilerPathCommand(),
     new GetChipCommand(),
     new GetChipUppercaseCommand(),
     new GetTargetCommand(),