fixup! let wasm_runtime build its own toolchain

Signed-off-by: Jorge Prendes <[email protected]>

Author: jprendes

src/hyperlight_wasm/build.rs

@@ -24,12 +24,22 @@ limitations under the License.
 
 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 append_to_path(path: impl Into<PathBuf>) {
+    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);
+    let paths = env::join_paths(paths).unwrap();
+    unsafe { env::set_var("PATH", &paths) };
+}
+
 fn get_wasm_runtime_path() -> PathBuf {
     let manifest_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
     let manifest_dir = PathBuf::from(manifest_dir);
@@ -95,6 +105,7 @@ 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();
 
@@ -113,6 +124,8 @@ fn build_wasm_runtime() -> PathBuf {
     let mut env_vars = env::vars().collect::<Vec<_>>();
     env_vars.retain(|(key, _)| !key.starts_with("CARGO_"));
 
+    append_to_path(&toolchain_dir);
+
     let mut cargo_cmd = std::process::Command::new(&cargo_bin);
     let cmd = cargo_cmd
         .arg("build")
@@ -123,8 +136,8 @@ fn build_wasm_runtime() -> PathBuf {
         .arg(&target_dir)
         .current_dir(&in_repo_dir)
         .env_clear()
-        .envs(env_vars);
-
+        .envs(env_vars)
+        .env("HYPERLIGHT_GUEST_TOOLCHAIN_ROOT", &toolchain_dir);
     let status = cmd
         .status()
         .unwrap_or_else(|e| panic!("could not run cargo build wasm_runtime: {}", e));

src/wasm_runtime/.cargo/config.toml

@@ -10,6 +10,9 @@ rustflags = [
 ]
 linker = "rust-lld"
 
+[env]
+HYPERLIGHT_GUEST_TOOLCHAIN_ROOT = { value = "guest-toolchain", relative = true }
+
 [profile.release]
 panic = "abort"
 

src/wasm_runtime/build.rs

@@ -19,62 +19,16 @@ use std::{env, fs};
 
 use cargo_metadata::{MetadataCommand, Package};
 
-fn ensure_toolchain() -> PathBuf {
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let out_dir = PathBuf::from(out_dir);
-    let toolchain_dir = env::var("HYPERLIGHT_GUEST_TOOLCHAIN_ROOT")
-        .map(PathBuf::from)
-        .unwrap_or_else(|_| out_dir.join("toolchain"));
-
-    if toolchain_dir.join("clang").exists() {
-        return toolchain_dir;
-    }
-
-    let cargo_bin = env::var_os("CARGO").unwrap();
-    let mut cargo_cmd = std::process::Command::new(&cargo_bin);
-
-    let profile = env::var_os("PROFILE").unwrap();
-    let profile = if profile == "debug" { "dev" } else { "release" };
-
-    // Clear the variables that control Cargo's behaviour (as listed
-    // at https://doc.rust-lang.org/cargo/reference/environment-variables.html):
-    // otherwise the nested build will build the wrong thing
-    let mut env_vars = env::vars().collect::<Vec<_>>();
-    env_vars.retain(|(key, _)| !key.starts_with("CARGO_"));
-
-    // we need to build hyperlight-guest-bin dependency of wasm_runtime, before wasm_runtime
-    let cmd = cargo_cmd
-        .arg("build")
-        .arg("--profile")
-        .arg(profile)
-        .arg("--package")
-        .arg("hyperlight-guest-bin")
-        .arg("-v")
-        .arg("--target-dir")
-        .arg(out_dir.join("toolchain-build"))
-        .env_clear()
-        .envs(env_vars)
-        .env("HYPERLIGHT_GUEST_TOOLCHAIN_ROOT", &toolchain_dir);
-
-    let status = cmd
-        .status()
-        .unwrap_or_else(|e| panic!("could not run build hyperlight toolchain: {}", e));
-
-    if !status.success() {
-        panic!("could not compile wasm_runtime");
-    }
+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!(
-        toolchain_dir.join("clang").exists(),
-        "could not find toolchain at {toolchain_dir:?} after building hyperlight-guest-bin",
+        clang_path.exists(),
+        "could not find clang at {clang_path:?}"
     );
 
-    toolchain_dir
-}
-
-fn main() {
-    let toolchain_dir = ensure_toolchain();
-
     println!("cargo:rerun-if-changed=.");
     let mut cfg = cc::Build::new();
 
@@ -109,7 +63,7 @@ fn main() {
 
     cfg.include("src/include");
     cfg.file("src/platform.c");
-    cfg.compiler(toolchain_dir.join("clang"));
+    cfg.compiler(clang_path);
     if cfg!(windows) {
         env::set_var("AR_x86_64_unknown_none", "llvm-ar");
     }