Updates for cargo plugin

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

Author: jsturtevant

.github/workflows/Benchmarks.yml

@@ -40,7 +40,9 @@ jobs:
 
     - name: Build Wasm Runtime Binary
       working-directory: ./src/hyperlight_wasm
-      run: just build-wasm-runtime ${{ matrix.config }}
+      run: |
+        just ensure-tools
+        just build-wasm-runtime ${{ matrix.config }}
 
     - uses: dtolnay/[email protected]
       with:

.github/workflows/dep_rust.yml

@@ -69,7 +69,9 @@ jobs:
 
       - name: Build Wasm Runtime Binary
         working-directory: ./src/hyperlight_wasm
-        run: just build-wasm-runtime ${{ matrix.config }}
+        run: |
+          just ensure-tools
+          just build-wasm-runtime ${{ matrix.config }}
 
       - name: Download Wasm Modules
         uses: actions/download-artifact@v5
@@ -81,7 +83,6 @@ jobs:
         run:  |
           # this must be build before the formatting and other jobs run
           # because the component model example depends on the wasm component built here
-          just ensure-tools
           just compile-wit
           just build-rust-component-examples ${{ matrix.config }}
       

Justfile

@@ -18,8 +18,9 @@ ensure-tools:
     cargo install wasm-tools --locked --version 1.235.0
     cargo install cargo-component --locked --version 0.21.1
     cargo install wit-bindgen-cli --locked --version 0.43.0
+    cargo install --git https://github.com/hyperlight-dev/cargo-hyperlight cargo-hyperlight
 
-build-all target=default-target features="": (build target features) (build-wasm-examples target features) (build-rust-wasm-examples target features) (build-rust-component-examples target) (build-wasm-runtime target features)
+build-all target=default-target features="": (build target features) (build-examples target features) (build-wasm-runtime target features)
 
 build target=default-target features="": (fmt-check)
     cargo build {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --verbose --profile={{ if target == "debug" {"dev"} else { target } }}
@@ -33,9 +34,11 @@ compile-wit:
     wasm-tools component wit ./src/component_sample/wit/example.wit -w -o ./src/component_sample/wit/component-world.wasm
 
 build-wasm-runtime target=default-target features="":
-    cd ./src/wasm_runtime && cargo build --verbose {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--features " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} && rm -R target
+    cd ./src/wasm_runtime && cargo hyperlight build --verbose {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--features " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} && rm -R target
 
-build-wasm-examples target=default-target features="": (compile-wit)
+build-examples target=default-target features="": (build-wasm-examples target features) (build-rust-wasm-examples target features) (build-rust-component-examples target features)
+
+build-wasm-examples target=default-target features="": (compile-wit) 
     {{ build-wasm-examples-command }} {{target}} {{features}}
 
 build-rust-wasm-examples target=default-target features="": (mkdir-redist target)
@@ -54,7 +57,7 @@ check target=default-target:
     cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
     cd src/rust_wasm_samples  && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
     cd src/component_sample  && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
-    cd src/wasm_runtime && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
+    cd src/wasm_runtime && cargo hyperlight check --profile={{ if target == "debug" {"dev"} else { target } }}
     cd src/hyperlight_wasm_macro && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
 
 fmt-check:
@@ -79,7 +82,7 @@ clippy target=default-target: (check target)
     cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
     cd src/rust_wasm_samples &&  cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
     cd src/component_sample &&  cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
-    cd src/wasm_runtime && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
+    cd src/wasm_runtime && cargo hyperlight clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
     cd src/hyperlight_wasm_macro && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
 
 # TESTING

src/hyperlight_wasm/build.rs

@@ -22,24 +22,14 @@ limitations under the License.
 // this file is included in lib.rs.
 // The wasm_runtime binary is expected to be in the x64/{config} directory.
 
-use std::ffi::OsString;
 use std::fs::OpenOptions;
 use std::io::Write;
-use std::iter::once;
 use std::path::{Path, PathBuf};
 use std::{env, fs};
 
 use anyhow::Result;
 use built::write_built_file;
 
-fn path_with(path: impl Into<PathBuf>) -> OsString {
-    let path = path.into();
-    let paths = env::var_os("PATH").unwrap_or_default();
-    let paths = env::split_paths(&paths);
-    let paths = once(path).chain(paths);
-    env::join_paths(paths).unwrap()
-}
-
 fn get_wasm_runtime_path() -> PathBuf {
     let manifest_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
     let manifest_dir = PathBuf::from(manifest_dir);
@@ -105,7 +95,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,19 +115,17 @@ 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);
+        .env("CFLAGS_x86_64_unknown_none", "-fPIC"); // Should this go on cargo hyperlight
 
     // Add --features gdb if the gdb feature is enabled for this build script
     if std::env::var("CARGO_FEATURE_GDB").is_ok() {
@@ -156,7 +143,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

@@ -14,21 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use std::path::{Path, PathBuf};
+use std::path::Path;
 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,8 @@ fn main() {
 
     cfg.include("src/include");
     cfg.file("src/platform.c");
-    cfg.compiler(clang_path);
+    cfg.flag("-ffreestanding");
+    cfg.flag("-nostdlib");
     if cfg!(windows) {
         env::set_var("AR_x86_64_unknown_none", "llvm-ar");
     }