Skip to content

Commit

Permalink
bump(main/rust): 1.84.0
Browse files Browse the repository at this point in the history
Remove building rust std wasm32-wasi
  • Loading branch information
truboxl committed Jan 12, 2025
1 parent 8ba7b11 commit 94b4fbc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
10 changes: 5 additions & 5 deletions packages/rust/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/
TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.83.0"
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION="1.84.0"
TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-${TERMUX_PKG_VERSION}-src.tar.xz
TERMUX_PKG_SHA256=7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
TERMUX_PKG_SHA256=bc2c1639f26814c7b17a323992f1e08c3b01fe88cdff9a27d951987d886e00b3
_LLVM_MAJOR_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION)
_LLVM_MAJOR_VERSION_NEXT=$((_LLVM_MAJOR_VERSION + 1))
_LZMA_VERSION=$(. $TERMUX_SCRIPTDIR/packages/liblzma/build.sh; echo $TERMUX_PKG_VERSION)
TERMUX_PKG_DEPENDS="clang, libc++, libllvm (<< ${_LLVM_MAJOR_VERSION_NEXT}), lld, openssl, zlib"
TERMUX_PKG_BUILD_DEPENDS="wasi-libc"
TERMUX_PKG_NO_REPLACE_GUESS_SCRIPTS=true
TERMUX_PKG_NO_STATICSPLIT=true
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_RM_AFTER_INSTALL="
bin/llc
bin/lld
bin/llvm-*
bin/opt
bin/sh
Expand Down Expand Up @@ -133,7 +134,7 @@ termux_step_configure() {
# like 30 to 40 + minutes ... so lets get it right

# upstream tests build using versions N and N-1
local BOOTSTRAP_VERSION=1.82.0
local BOOTSTRAP_VERSION=1.83.0
if [[ "${TERMUX_ON_DEVICE_BUILD}" == "false" ]]; then
if ! rustup install "${BOOTSTRAP_VERSION}"; then
echo "WARN: ${BOOTSTRAP_VERSION} is unavailable, fallback to stable version!"
Expand Down Expand Up @@ -215,7 +216,6 @@ termux_step_make_install() {
# error: could not document `std`
"${TERMUX_PKG_SRCDIR}/x.py" install -j ${TERMUX_PKG_MAKE_PROCESSES} --target wasm32-unknown-unknown --stage 1 std
[[ ! -e "${TERMUX_PREFIX}/share/wasi-sysroot" ]] && termux_error_exit "wasi-sysroot not found"
"${TERMUX_PKG_SRCDIR}/x.py" install -j ${TERMUX_PKG_MAKE_PROCESSES} --target wasm32-wasi --stage 1 std
"${TERMUX_PKG_SRCDIR}/x.py" install -j ${TERMUX_PKG_MAKE_PROCESSES} --target wasm32-wasip1 --stage 1 std
"${TERMUX_PKG_SRCDIR}/x.py" install -j ${TERMUX_PKG_MAKE_PROCESSES} --target wasm32-wasip2 --stage 1 std

Expand Down
6 changes: 3 additions & 3 deletions packages/rust/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# See documentation at
# https://github.com/rust-lang/rust/blob/master/config.example.toml

# https://github.com/rust-lang/rust/issues/135358
profile = "dist"

[llvm]
download-ci-llvm = false
link-shared = true
Expand Down Expand Up @@ -63,9 +66,6 @@ profiler = true
llvm-config = "@TERMUX_PREFIX@/bin/llvm-config"
profiler = true

[target.wasm32-wasi]
wasi-root = "@TERMUX_PREFIX@/share/wasi-sysroot"

[target.wasm32-wasip1]
wasi-root = "@TERMUX_PREFIX@/share/wasi-sysroot"

Expand Down
8 changes: 0 additions & 8 deletions packages/rust/rust-std-wasm32-wasi.subpackage.sh

This file was deleted.

0 comments on commit 94b4fbc

Please sign in to comment.