Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
moodlezoup committed Aug 5, 2024
1 parent 11070d6 commit 6338555
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
id: rustc-toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2024-01-25
toolchain: nightly-2024-07-30
default: true

- uses: lukka/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build-toolchain:
GITHUB_ACTIONS=false CARGO_TARGET_RISCV32I_JOLT_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build
GITHUB_ACTIONS=false CARGO_TARGET_RISCV32I_JOLT_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic" ./x build --stage 2
GITHUB_ACTIONS=false CARGO_TARGET_RISCV32I_JOLT_ZKVM_ELF_RUSTFLAGS="-Cpasses=lower-atomic" ./x build
GITHUB_ACTIONS=false CARGO_TARGET_RISCV32I_JOLT_ZKVM_ELF_RUSTFLAGS="-Cpasses=lower-atomic" ./x build --stage 2

install-toolchain:
rustup toolchain link riscv32i-jolt-zkvm-elf build/host/stage2
Expand Down
3 changes: 1 addition & 2 deletions config.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
changelog-seen = 2
change-id = 125181

[build]
target = ["riscv32i-jolt-zkvm-elf"]
Expand All @@ -12,4 +12,3 @@ llvm-tools = true

[llvm]
download-ci-llvm = false

4 changes: 2 additions & 2 deletions library/std/src/sys/pal/zkvm/alloc.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use crate::alloc::{GlobalAlloc, Layout, System};
use super::abi::sys_alloc;
use crate::alloc::{GlobalAlloc, Layout, System};

#[stable(feature = "alloc_system_type", since = "1.28.0")]
unsafe impl GlobalAlloc for System {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
sys_alloc(layout.size(), layout.align())
unsafe { sys_alloc(layout.size(), layout.align()) }
}

unsafe fn dealloc(&self, _ptr: *mut u8, _layout: Layout) {}
Expand Down
8 changes: 4 additions & 4 deletions src/bootstrap/src/core/sanity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,10 @@ than building it.
}

if !has_target {
panic!(
"No such target exists in the target list,
specify a correct location of the JSON specification file for custom targets!"
);
// panic!(
// "No such target exists in the target list,
// specify a correct location of the JSON specification file for custom targets!"
// );
}
}

Expand Down

0 comments on commit 6338555

Please sign in to comment.