Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

env:
CARGO_TERM_COLOR: always
WASI_SDK_VERSION: 30
WASI_SDK_VERSION: 33

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

env:
CARGO_TERM_COLOR: always
WASI_SDK_VERSION: 30
WASI_SDK_VERSION: 33

jobs:
linux:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ First, make sure you've got all the submodules cloned.
git submodule update --init --recursive
```

Next, install WASI-SDK 30 to `/opt/wasi-sdk` (alternatively, you can specify a
Next, install WASI-SDK 33 to `/opt/wasi-sdk` (alternatively, you can specify a
different location and reference it later using the `WASI_SDK_PATH` environment
variable). Replace `arm64-linux` with `x86_64-linux`, `arm64-macos`,
`x86_64-macos`, `arm64-windows`, or `x86_64-windows` below depending on your
architecure and OS, if necessary.

```shell
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-30/wasi-sdk-30.0-arm64-linux.tar.gz
tar xf wasi-sdk-30.0-arm64-linux.tar.gz
sudo mv wasi-sdk-30.0-arm64-linux /opt/wasi-sdk
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-33/wasi-sdk-33.0-arm64-linux.tar.gz
tar xf wasi-sdk-33.0-arm64-linux.tar.gz
sudo mv wasi-sdk-33.0-arm64-linux /opt/wasi-sdk
export WASI_SDK_PATH=/opt/wasi-sdk
```

Expand Down
17 changes: 13 additions & 4 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use {
const DEBUG_RUNTIME: bool = false;
const STRIP_RUNTIME: bool = !DEBUG_RUNTIME;
const ZSTD_COMPRESSION_LEVEL: i32 = if DEBUG_RUNTIME { 0 } else { 19 };
const DEFAULT_SDK_VERSION: &str = "30";
const DEFAULT_SDK_VERSION: &str = "33";

// SQLite version to build - 3.51.2 (latest as of Jan 2026)
const SQLITE_VERSION: &str = "3510200";
Expand Down Expand Up @@ -191,8 +191,6 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
"libwasi-emulated-process-clocks.so",
"libwasi-emulated-getpid.so",
"libwasi-emulated-signal.so",
"libc++.so",
"libc++abi.so",
];

for library in libraries {
Expand All @@ -204,6 +202,17 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
)?;
}

let libraries = ["libc++.so", "libc++abi.so"];

for library in libraries {
compress(
&wasi_sdk.join("share/wasi-sysroot/lib/wasm32-wasip2/noeh"),
library,
out_dir,
true,
)?;
}

compress(&cpython_wasi_dir, "libpython3.14.so", out_dir, true)?;

let path = repo_dir.join("cpython/builddir/wasi/install/lib/python3.14");
Expand Down Expand Up @@ -300,7 +309,7 @@ fn maybe_make_cpython(repo_dir: &Path, wasi_sdk: &Path) -> Result<()> {
let url = &env::var("CPYTHON_TARBALL_URL").unwrap_or_else(|_| CPYTHON_TARBALL_URL.into());
let base_dir = &env::var_os("CPYTHON_TARBALL_BASE_DIR")
.unwrap_or_else(|| CPYTHON_TARBALL_BASE_DIR.into());
println!("cargo:warning=downloading CPython source code from {url}...");
println!("cargo:warning=downloading CPython source code from {url}");
fetch_extract(url, repo_dir)?;
fs::rename(repo_dir.join(base_dir), &cpython_dir)?;
}
Expand Down
Loading