Fix broken cargo home

Author: dwoz

relenv/buildenv.py

@@ -113,8 +113,9 @@ def buildenv(
         "OPENSSL_INCLUDE_DIR": f"{relenv_path}/include",
         "OPENSSL_LIB_DIR": f"{relenv_path}/lib",
         "PKG_CONFIG_PATH": f"{relenv_path}/lib/pkgconfig",
+        "RUSTFLAGS": f"-L {relenv_path}/lib -C link-arg=-Wl,-rpath,{relenv_path}/lib",
     }
-    if sys.platform == "dawin":
+    if sys.platform == "darwin":
         env["MACOS_DEVELOPMENT_TARGET"] = MACOS_DEVELOPMENT_TARGET
     return env
 

relenv/runtime.py

@@ -701,10 +701,9 @@ def wrap(func: Callable[..., Any]) -> Callable[..., Any]:
         def wrapper(*args: Any, **kwargs: Any) -> Any:
             if sys.platform != "linux":
                 return func(*args, **kwargs)
-            base_dir = common().DATA_DIR / "toolchain"
-            toolchain = base_dir / common().get_triplet()
+            toolchain = common().get_toolchain()
             cargo_home = str(common().DATA_DIR / "cargo")
-            if not toolchain.exists():
+            if toolchain is None or not toolchain.exists():
                 debug("Unable to set CARGO_HOME no toolchain exists")
             else:
                 relenvroot = str(sys.RELENV)