Add support for dynamic target triple selection in compile and run functionality

Author: oligamiq

page/src/App.tsx

@@ -1,4 +1,4 @@
-import type { Component } from "solid-js";
+import { createSignal, type Component } from "solid-js";
 import { SetupMyTerminal } from "./xterm";
 import type { WASIFarmRef } from "@oligami/browser_wasi_shim-threads";
 import type { Ctx } from "./ctx";
@@ -22,6 +22,8 @@ const App = (props: {
   };
   let load_additional_sysroot: (string) => void;
 
+  const [triple, setTriple] = createSignal("wasm32-wasip1");
+
   return (
     <>
       <MonacoEditor
@@ -35,14 +37,15 @@ const App = (props: {
       <SetupMyTerminal ctx={props.ctx} callback={props.callback} />
       <div class="flex">
         <div class="p-4 text-white">
-          <RunButton />
+          <RunButton triple={triple()} />
         </div>
         <div class="p-4 text-white" style={{ width: "60vw" }}>
           <Select
             options={triples}
             class="text-4xl text-green-700"
             onChange={(value) => {
               console.log(value);
+              setTriple(value);
               if (load_additional_sysroot === undefined) {
                 load_additional_sysroot = new SharedObjectRef(
                   props.ctx.load_additional_sysroot_id,

page/src/btn.tsx

@@ -1,12 +1,14 @@
 import { compile_and_run, download } from "./compile_and_run";
 
-export const RunButton = () => {
+export const RunButton = (props: {
+  triple: string;
+}) => {
   return (
     <button
       type="button"
       onClick={() => {
         console.log("run button clicked");
-        compile_and_run();
+        compile_and_run(props.triple);
       }}
       class="text-2xl text-green-700"
     >

page/src/compile_and_run.ts

@@ -35,7 +35,9 @@ export const compile_and_run_setup = (_ctx: Ctx) => {
 
 let can_setup = false;
 
-export const compile_and_run = async () => {
+export const compile_and_run = async (
+  triple: string,
+) => {
   if (!can_setup) {
     if (await waiter.is_all_done()) {
       terminal = new SharedObjectRef(ctx.terminal_id).proxy<(string) => void>();
@@ -58,11 +60,33 @@ export const compile_and_run = async () => {
       "--sysroot",
       "/sysroot",
       "--target",
-      "wasm32-wasip1",
+      triple,
       "--out-dir",
       "/tmp",
       "-Ccodegen-units=1",
     ];
+    if (triple === "wasm32-wasip1") {
+      exec.push("-Clinker-flavor=wasm-ld");
+      exec.push("-Clinker=wasm-ld");
+    } else {
+      exec.push("-Zunstable-options");
+      exec.push("-Clinker-flavor=gnu");
+      exec.push("-Clinker=lld");
+    }
+    // const exec = [
+    //   "rustc",
+    //   "/main.rs",
+    //   "--sysroot",
+    //   "/sysroot",
+    //   "--target",
+    //   "x86_64-unknown-linux-musl",
+    //   "--out-dir",
+    //   "/linux",
+    //   "-Zunstable-options",
+    //   "-Clinker-flavor=gnu",
+    //   "-Clinker=lld",
+    //   "-Ccodegen-units=1",
+    // ];
     await terminal(`${exec.join(" ")}\r\n`);
     await cmd_parser(...exec);
     while (!(await waiter.is_cmd_run_end())) {

page/src/rustc.ts

@@ -66,9 +66,14 @@ globalThis.addEventListener("message", async (event) => {
     wasi.get_share_memory().grow(200);
 
     rustc_shared = new SharedObject((...args) => {
-      wasi.args = ["rustc", ...args];
-      wasi.block_start_on_thread();
-      console.log("wasi.start done");
+      try {
+        wasi.args = ["rustc", ...args];
+        console.log("wasi.start");
+        wasi.block_start_on_thread();
+        console.log("wasi.start done");
+      } catch (e) {
+        terminal(e.toString());
+      }
     }, ctx.rustc_id);
 
     waiter.rustc();