From 709da2bd83ea7f09c58cd60d5daa17c8d99be122 Mon Sep 17 00:00:00 2001
From: Xuejie Xiao <xxuejie@gmail.com>
Date: Wed, 2 Aug 2023 04:30:22 +0000
Subject: [PATCH] Use RUSTFLAGS to enable B extension instead of custom
 toolchain

---
 build.sh       | 8 ++++++--
 rust-toolchain | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index e8a89cc..d5878f7 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -ex
 
+
 cargo build --release --package tx-generator
-cargo build --release --package rust-baseline-verifier --target=riscv64imac_zba_zbb_zbc_zbs-unknown-ckb-elf
-cargo build --release --package rust-compiled-verifier --target=riscv64imac_zba_zbb_zbc_zbs-unknown-ckb-elf
+
+export RUSTFLAGS='-C target-feature=+zba,+zbb,+zbc,+zbs'
+cargo build --release --package rust-baseline-verifier --target=riscv64imac-unknown-none-elf
+cargo build --release --package rust-compiled-verifier --target=riscv64imac-unknown-none-elf
+unset RUSTFLAGS
 
 riscv64-ckb-elf-gcc c/ckb_mmr_entry.c -o c_verifier \
   -O3 -nostdlib -nostdinc -g \
diff --git a/rust-toolchain b/rust-toolchain
index c72a4ae..b8f7495 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-ckb-20230331-2
+nightly-2023-03-31