Updates for cargo plugin

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

src/hyperlight_wasm/build.rs

@@ -105,7 +105,6 @@ fn build_wasm_runtime() -> PathBuf {
     let out_dir = env::var_os("OUT_DIR").unwrap();
 
     let target_dir = Path::new("").join(&out_dir).join("target");
-    let toolchain_dir = Path::new("").join(&out_dir).join("toolchain");
 
     let in_repo_dir = get_wasm_runtime_path();
 
@@ -126,20 +125,21 @@ fn build_wasm_runtime() -> PathBuf {
 
     let mut cargo_cmd = std::process::Command::new(&cargo_bin);
     let mut cmd = cargo_cmd
+        .arg("hyperlight")
         .arg("build")
+        .arg("--target-dir")
+        .arg(&target_dir)
         .arg("--profile")
         .arg(cargo_profile)
         .arg("-v")
-        .arg("--target-dir")
-        .arg(&target_dir)
         .current_dir(&in_repo_dir)
         .env_clear()
-        // On windows when `gdb` features is enabled this is not set correctly
-        .env("CFLAGS_x86_64_unknown_none", "-fPIC")
-        .envs(env_vars)
-        .env("PATH", path_with(&toolchain_dir))
-        .env("HYPERLIGHT_GUEST_TOOLCHAIN_ROOT", &toolchain_dir);
+        .envs(env_vars);
 
+        // should this go in cargo hyperlight?
+        // On windows when `gdb` features is enabled this is not set correctly
+        //.env("CFLAGS_x86_64_unknown_none", "-fPIC")
+       
     // Add --features gdb if the gdb feature is enabled for this build script
     if std::env::var("CARGO_FEATURE_GDB").is_ok() {
         cmd = cmd.arg("--features").arg("gdb");
@@ -152,7 +152,7 @@ fn build_wasm_runtime() -> PathBuf {
         panic!("could not compile wasm_runtime");
     }
     let resource = target_dir
-        .join("x86_64-unknown-none")
+        .join("x86_64-hyperlight-none")
         .join(profile)
         .join("wasm_runtime");
 

src/wasm_runtime/.cargo/config.toml

@@ -20,15 +20,6 @@ use std::{env, fs};
 use cargo_metadata::{MetadataCommand, Package};
 
 fn main() {
-    let toolchain_dir = env::var_os("HYPERLIGHT_GUEST_TOOLCHAIN_ROOT").unwrap();
-    let toolchain_dir = PathBuf::from(toolchain_dir);
-    let clang_path = toolchain_dir.join("clang");
-
-    assert!(
-        clang_path.exists(),
-        "could not find clang at {clang_path:?}"
-    );
-
     println!("cargo:rerun-if-changed=.");
     let mut cfg = cc::Build::new();
 
@@ -63,7 +54,6 @@ fn main() {
 
     cfg.include("src/include");
     cfg.file("src/platform.c");
-    cfg.compiler(clang_path);
     if cfg!(windows) {
         env::set_var("AR_x86_64_unknown_none", "llvm-ar");
     }