Skip to content

use Path::to_str instead of Path::display where appropriate #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dicej merged 1 commit into from
Feb 2, 2026
Merged

use Path::to_str instead of Path::display where appropriate #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 26 additions & 11 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,25 +302,23 @@ fn maybe_make_cpython(repo_dir: &Path, wasi_sdk: &Path) -> Result<()> {
let config_guess =
run(Command::new("../../config.guess").current_dir(&cpython_wasi_dir))?;

let dir = cpython_wasi_dir
.to_str()
.ok_or_else(|| anyhow!("non-utf8 path: {}", cpython_wasi_dir.display()))?;

run(Command::new("../../Tools/wasm/wasi-env")
.env(
"CONFIG_SITE",
"../../Tools/wasm/wasi/config.site-wasm32-wasi",
)
.env(
"CFLAGS",
format!(
"--target=wasm32-wasip2 -fPIC -I{}/deps/include",
cpython_wasi_dir.display()
),
format!("--target=wasm32-wasip2 -fPIC -I{dir}/deps/include",),
)
.env("WASI_SDK_PATH", wasi_sdk)
.env(
"LDFLAGS",
format!(
"--target=wasm32-wasip2 -L{}/deps/lib",
cpython_wasi_dir.display()
),
format!("--target=wasm32-wasip2 -L{dir}/deps/lib",),
)
.current_dir(&cpython_wasi_dir)
.args([
Expand Down Expand Up @@ -524,21 +522,38 @@ fn build_zlib(wasi_sdk: &Path, install_dir: &Path) -> Result<()> {
&out_dir,
)?;
let src_dir = out_dir.join("zlib-1.3.1");

let prefix = install_dir
.to_str()
.ok_or_else(|| anyhow!("non-utf8 path: {}", install_dir.display()))?;

let mut configure = Command::new("./configure");
add_compile_envs(wasi_sdk, &mut configure);
configure
.current_dir(&src_dir)
.arg("--static")
.arg(format!("--prefix={}", install_dir.display()));
.arg(format!("--prefix={prefix}"));
run(&mut configure)?;

let ar_dir = wasi_sdk.join("bin/ar");
let ar_dir = ar_dir
.to_str()
.ok_or_else(|| anyhow!("non-utf8 path: {}", ar_dir.display()))?;

let clang_dir = wasi_sdk.join("bin/clang");
let clang_dir = clang_dir
.to_str()
.ok_or_else(|| anyhow!("non-utf8 path: {}", clang_dir.display()))?;

let mut make = Command::new("make");
add_compile_envs(wasi_sdk, &mut make);
make.current_dir(src_dir)
.arg(format!("AR={}", wasi_sdk.join("bin/ar").display()))
.arg(format!("AR={ar_dir}"))
.arg("ARFLAGS=rcs")
.arg(format!("CC={}", wasi_sdk.join("bin/clang").display()))
.arg(format!("CC={clang_dir}"))
.arg("static")
.arg("install");
run(&mut make)?;

Ok(())
}