From db98cc820cee8e070ab28aaf92d2fbe6e0dddba7 Mon Sep 17 00:00:00 2001
From: Louis Pahlavi <louis.pahlavi@dfinity.org>
Date: Wed, 25 Jun 2025 15:44:08 +0200
Subject: [PATCH] Use build scripts for basic_solana local and mainnet
 deployments

---
 examples/basic_solana/build.sh         | 18 ++++++++++++++++++
 examples/basic_solana/local/dfx.json   |  8 ++------
 examples/basic_solana/mainnet/dfx.json |  4 +---
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100755 examples/basic_solana/build.sh

diff --git a/examples/basic_solana/build.sh b/examples/basic_solana/build.sh
new file mode 100755
index 00000000..0c2ef7eb
--- /dev/null
+++ b/examples/basic_solana/build.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+TARGET="wasm32-unknown-unknown"
+
+# Optional manifest path
+MANIFEST_ARG=""
+if [ $# -ge 1 ]; then
+  MANIFEST_ARG="--manifest-path $1"
+fi
+
+# Build based on the platform
+if [ "$(uname)" == "Darwin" ]; then
+  LLVM_PATH=$(brew --prefix llvm)
+  AR="${LLVM_PATH}/bin/llvm-ar" CC="${LLVM_PATH}/bin/clang" cargo build --target "$TARGET" --release $MANIFEST_ARG
+else
+  cargo build --target "$TARGET" --release $MANIFEST_ARG
+fi
\ No newline at end of file
diff --git a/examples/basic_solana/local/dfx.json b/examples/basic_solana/local/dfx.json
index 39612efc..ad97cd5a 100644
--- a/examples/basic_solana/local/dfx.json
+++ b/examples/basic_solana/local/dfx.json
@@ -5,9 +5,7 @@
       "candid": "../../../canister/sol_rpc_canister.did",
       "package": "sol_rpc_canister",
       "type": "custom",
-      "build": [
-        "cargo build --no-default-features --target wasm32-unknown-unknown --release --manifest-path ../../../canister/Cargo.toml"
-      ],
+      "build": "../build.sh \"../../../canister/Cargo.toml\"",
       "wasm": "../../../target/wasm32-unknown-unknown/release/sol_rpc_canister.wasm",
       "metadata": [
         {
@@ -21,9 +19,7 @@
       "candid": "../basic_solana.did",
       "package": "basic_solana",
       "type": "custom",
-      "build": [
-        "cargo build --no-default-features --target wasm32-unknown-unknown --release"
-      ],
+      "build": "../build.sh",
       "wasm": "../../../target/wasm32-unknown-unknown/release/basic_solana.wasm",
       "metadata": [
         {
diff --git a/examples/basic_solana/mainnet/dfx.json b/examples/basic_solana/mainnet/dfx.json
index 88e23b0f..e0cf006f 100644
--- a/examples/basic_solana/mainnet/dfx.json
+++ b/examples/basic_solana/mainnet/dfx.json
@@ -4,9 +4,7 @@
       "candid": "../basic_solana.did",
       "package": "basic_solana",
       "type": "custom",
-      "build": [
-        "cargo build --no-default-features --target wasm32-unknown-unknown --release"
-      ],
+      "build": "../build.sh",
       "wasm": "../../../target/wasm32-unknown-unknown/release/basic_solana.wasm",
       "metadata": [
         {