Update config

Author: lrettig

build.sh

@@ -6,5 +6,5 @@ source config.sh
 
 # Will create component archives (dists) ./rust/build/dist
 cd rust
-CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build
-CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build --stage 2
+CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build --target $TOOLCHAIN_HOST_TRIPLET,riscv32em-athena-zkvm-elf
+CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build --stage 2 --target $TOOLCHAIN_HOST_TRIPLET,riscv32em-athena-zkvm-elf

patches/config.ci.toml

@@ -0,0 +1,15 @@
+change-id = 121754
+
+[build]
+extended = true
+tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
+configure-args = []
+cargo-native-static = true
+
+[rust]
+lld = true
+llvm-tools = true
+channel = "nightly"
+
+[llvm]
+targets = "AArch64;RISCV;X86"

patches/config.toml

@@ -1,7 +1,6 @@
 change-id = 121754
 
 [build]
-target = ["riscv32em-athena-zkvm-elf"]
 extended = true
 tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
 configure-args = []
@@ -12,4 +11,4 @@ llvm-tools = true
 channel = "nightly"
 
 [llvm]
-download-ci-llvm = false
+targets = "AArch64;RISCV;X86"