wasm-builder: Use polkavm_linker::target_json_32_path()

Signed-off-by: Jarkko Sakkinen <[email protected]>
paritytech · Nov 21, 2024 · 8104f30 · 8104f30
1 parent 1816669
commit 8104f30
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1090,8 +1090,8 @@ polkadot-test-client = { path = "polkadot/node/test/client" }
 polkadot-test-runtime = { path = "polkadot/runtime/test-runtime" }
 polkadot-test-service = { path = "polkadot/node/test/service" }
 polkavm = { version = "0.9.3", default-features = false }
-polkavm-derive = "0.16.0"
-polkavm-linker = "0.16.1"
+polkavm-derive = "0.17.0"
+polkavm-linker = "0.17.0"
 portpicker = { version = "0.1.1" }
 pretty_assertions = { version = "1.3.0" }
 primitive-types = { version = "0.13.1", default-features = false, features = [

diff --git a/substrate/utils/wasm-builder/src/lib.rs b/substrate/utils/wasm-builder/src/lib.rs
@@ -408,11 +408,10 @@ impl RuntimeTarget {
 	fn rustc_target(self) -> String {
 		match self {
 			RuntimeTarget::Wasm => "wasm32-unknown-unknown".to_string(),
-			RuntimeTarget::Riscv => Path::new(env!("CARGO_MANIFEST_DIR"))
-				.join("riscv32emac-unknown-none-polkavm.json")
-				.into_os_string()
-				.into_string()
-				.unwrap(),
+			RuntimeTarget::Riscv => {
+				let path = polkavm_linker::target_json_32_path().expect("riscv not found");
+				path.into_os_string().into_string().unwrap()
+			},
 		}
 	}