Tweak install-build-deps.sh script (#593)
* add additional flag * downgrade bindgen * Fix rust build --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: José Molina <jose@blockdeep.io>
This commit is contained in:
co-authored by
github-actions[bot]
José Molina
parent
24a46c7262
commit
c6f8748878
@@ -3,7 +3,7 @@
|
||||
# This software may be modified and distributed under the terms
|
||||
# of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
set -e
|
||||
set -ex
|
||||
|
||||
source ../scripts/rust-version.sh
|
||||
|
||||
@@ -16,11 +16,7 @@ DENO_ASM=$DENO_DIR/data.js
|
||||
# build new via wasm-pack
|
||||
echo "*** Building Rust sources"
|
||||
cd $PKG_NAME
|
||||
if [ "$RUST_VER" == "stable" ]; then
|
||||
RUSTC_BOOTSTRAP=1 cargo build --target wasm32-unknown-unknown --release -Z build-std=std,panic_abort
|
||||
else
|
||||
rustup run $RUST_VER xargo build --target wasm32-unknown-unknown --release
|
||||
fi
|
||||
RUSTC_BOOTSTRAP=1 cargo build --target wasm32-unknown-unknown --release -Z build-std=std,panic_abort
|
||||
cd ..
|
||||
|
||||
echo "*** Converting to WASM"
|
||||
|
||||
@@ -9,14 +9,14 @@ source ./scripts/rust-version.sh
|
||||
|
||||
# NOTE If this is bumped, bump the version in Cargo.toml as well
|
||||
BINDGEN_REPO=https://github.com/rustwasm/wasm-bindgen
|
||||
BINDGEN_VER=0.2.100
|
||||
BINDGEN_VER=0.2.80
|
||||
BINDGEN_ZIP=
|
||||
|
||||
|
||||
|
||||
|
||||
BINARYEN_REPO=https://github.com/WebAssembly/binaryen
|
||||
BINARYEN_VER=version_123
|
||||
BINARYEN_VER=version_120
|
||||
BINARYEN_ZIP=
|
||||
|
||||
WABT_REPO=https://github.com/WebAssembly/wabt
|
||||
@@ -27,15 +27,10 @@ unamestr=`uname`
|
||||
|
||||
# toolchain with rust-src (for panic overrdides) and the right wasm32 toolchain
|
||||
rustup toolchain install $RUST_VER -c rust-src -t wasm32-unknown-unknown
|
||||
rustup toolchain install $NIGHTLY_VER
|
||||
rustup default $NIGHTLY_VER
|
||||
rustup default $RUST_VER
|
||||
|
||||
rustup show
|
||||
|
||||
if [ "$RUST_VER" != "stable" ]; then
|
||||
cargo install xargo
|
||||
fi
|
||||
|
||||
if [[ "$unamestr" == 'Linux' ]]; then
|
||||
echo "*** Detected Linux"
|
||||
BINARYEN_ZIP=binaryen-$BINARYEN_VER-x86_64-linux
|
||||
|
||||
@@ -3,8 +3,4 @@
|
||||
# This software may be modified and distributed under the terms
|
||||
# of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
RUST_VER=stable
|
||||
# RUST_VER=stable
|
||||
|
||||
NIGHTLY_VER=nightly-2024-11-22
|
||||
|
||||
RUST_VER=1.85
|
||||
|
||||
Reference in New Issue
Block a user