Use succinct config as well

Update README

Author: lrettig

README.md

@@ -1,6 +1,6 @@
 # Compiled Rust Toolchain for RV32E
 
-This repository compile and publish as release final binaries of the Rust toolchain targetting RISC-V RV32E.
+This repository compiles and publishes as release final binaries of the Rust toolchain targeting RISC-V RV32E.
 
 ## Building
 
@@ -29,14 +29,3 @@ xattr -rc ~/.rustup/toolchains/rve-nightly
 The last step is needed when downloading the binary toolchain with Safari. Otherwise GateKeeper will prevent running downloaded binaries without code signature:
 
 <img width="245" alt="326768663-26a8b06f-5074-485e-9677-12806b0454bd" src="https://github.com/paritytech/rustc-rv32e-toolchain/assets/2580396/5fd140ae-526c-435c-8e6c-ba91a3ab27d3">
-
-## Build with `ci-unified`
-
-If there is a need to build the toolchain using [Parity default CI environment](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-unified), tweak the build step as follows:
-
-```
-export CXX=/usr/bin/clang++-15
-...
-./build.sh --DCMAKE_BUILD_TYPE=Release
-...
-```

build.sh

@@ -6,4 +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 dist rustc rust-std cargo rust-src rustfmt clippy --target $TOOLCHAIN_HOST_TRIPLET,riscv32em-athena-zkvm-elf
+CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build
+CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build --stage 2

clone.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 source config.sh -rust_commit
 
-git clone --depth 1 "https://github.com/succinctlabs/rust.git"
+git clone "https://github.com/succinctlabs/rust.git" --depth 1 --single-branch --branch succinct
 cd rust
 git fetch --depth 1 origin $RUST_COMMIT
 git checkout FETCH_HEAD

package.sh

@@ -20,7 +20,7 @@ inst () {
 
 # dist contains the tared components we want to install
 mv rust/build/dist .
-rm -rf rust
+#rm -rf rust
 
 cd dist
 mkdir unpack

patches/config.toml

@@ -1,24 +1,15 @@
-change-id = 102579
-profile = "user"
-
-[llvm]
-targets = "AArch64;RISCV;X86"
+change-id = 116881
 
 [build]
-compiler-docs = true
-docs = false
-locked-deps = true
+target = ["riscv32em-athena-zkvm-elf"]
+extended = true
+tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
+configure-args = []
 
 [rust]
-channel = "nightly"
 lld = true
-jemalloc = true
-debuginfo-level-std = 2
-remap-debuginfo = true
-new-symbol-mangling = true
-split-debuginfo = "off"
+llvm-tools = true
+channel = "nightly"
 
-# we gonna repack anyways so time spent on compression here is wasted
-[dist]
-compression-formats = ["gz"]
-compression-profile = "fast"
+[llvm]
+download-ci-llvm = false