Use Path::to_str throughout build.rs

Author: sd2k

build.rs

@@ -294,7 +294,9 @@ fn maybe_make_cpython(repo_dir: &Path, wasi_sdk: &Path) -> Result<()> {
                     .current_dir(&cpython_native_dir)
                     .arg(format!(
                         "--prefix={}/install",
-                        cpython_native_dir.to_str().unwrap()
+                        cpython_native_dir
+                            .to_str()
+                            .ok_or_else(|| anyhow!("non-UTF8 path: {}", cpython_native_dir.display()))?
                     )))?;
 
                 run(Command::new("make").current_dir(cpython_native_dir))?;
@@ -310,6 +312,9 @@ fn maybe_make_cpython(repo_dir: &Path, wasi_sdk: &Path) -> Result<()> {
 
             // Configure CPython with SQLite support
             // The CFLAGS and LDFLAGS now include paths to both zlib AND sqlite
+            let cpython_wasi_dir_str = 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",
@@ -318,16 +323,14 @@ fn maybe_make_cpython(repo_dir: &Path, wasi_sdk: &Path) -> Result<()> {
                 .env(
                     "CFLAGS",
                     format!(
-                        "--target=wasm32-wasip2 -fPIC -I{}/deps/include",
-                        cpython_wasi_dir.display()
+                        "--target=wasm32-wasip2 -fPIC -I{cpython_wasi_dir_str}/deps/include",
                     ),
                 )
                 .env("WASI_SDK_PATH", wasi_sdk)
                 .env(
                     "LDFLAGS",
                     format!(
-                        "--target=wasm32-wasip2 -L{}/deps/lib",
-                        cpython_wasi_dir.display()
+                        "--target=wasm32-wasip2 -L{cpython_wasi_dir_str}/deps/lib",
                     ),
                 )
                 .current_dir(&cpython_wasi_dir)
@@ -337,10 +340,9 @@ fn maybe_make_cpython(repo_dir: &Path, wasi_sdk: &Path) -> Result<()> {
                     "--host=wasm32-unknown-wasip2",
                     &format!("--build={}", String::from_utf8(config_guess)?),
                     &format!(
-                        "--with-build-python={}/../build/{PYTHON_EXECUTABLE}",
-                        cpython_wasi_dir.to_str().unwrap()
+                        "--with-build-python={cpython_wasi_dir_str}/../build/{PYTHON_EXECUTABLE}",
                     ),
-                    &format!("--prefix={}/install", cpython_wasi_dir.to_str().unwrap()),
+                    &format!("--prefix={cpython_wasi_dir_str}/install"),
                     "--disable-test-modules",
                     "--enable-ipv6",
                 ]))?;
@@ -577,19 +579,30 @@ fn build_zlib(wasi_sdk: &Path, install_dir: &Path) -> Result<()> {
         &out_dir,
     )?;
     let src_dir = out_dir.join("zlib-1.3.1");
+    let install_dir_str = install_dir
+        .to_str()
+        .ok_or_else(|| anyhow!("non-UTF8 path: {}", install_dir.display()))?;
+    let ar_path = wasi_sdk.join("bin/ar");
+    let ar_str = ar_path
+        .to_str()
+        .ok_or_else(|| anyhow!("non-UTF8 path: {}", ar_path.display()))?;
+    let cc_path = wasi_sdk.join("bin/clang");
+    let cc_str = cc_path
+        .to_str()
+        .ok_or_else(|| anyhow!("non-UTF8 path: {}", cc_path.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={install_dir_str}"));
     run(&mut configure)?;
     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_str}"))
         .arg("ARFLAGS=rcs")
-        .arg(format!("CC={}", wasi_sdk.join("bin/clang").display()))
+        .arg(format!("CC={cc_str}"))
         .arg("static")
         .arg("install");
     run(&mut make)?;
@@ -625,15 +638,24 @@ fn build_sqlite(wasi_sdk: &Path, install_dir: &Path) -> Result<()> {
     fs::create_dir_all(install_dir.join("include"))?;
 
     let sysroot = wasi_sdk.join("share/wasi-sysroot");
-    let sysroot_str = sysroot.to_string_lossy();
+    let sysroot_str = sysroot
+        .to_str()
+        .ok_or_else(|| anyhow!("non-UTF8 path: {}", sysroot.display()))?;
+    let install_dir_str = install_dir
+        .to_str()
+        .ok_or_else(|| anyhow!("non-UTF8 path: {}", install_dir.display()))?;
+    let ar_path = wasi_sdk.join("bin/ar");
+    let ar_str = ar_path
+        .to_str()
+        .ok_or_else(|| anyhow!("non-UTF8 path: {}", ar_path.display()))?;
 
     // SQLite-specific CFLAGS for WASI compatibility
     // Note: Don't set SQLITE_THREADSAFE here - let --disable-threadsafe handle it
     // to avoid macro redefinition warnings
     let sqlite_cflags = format!(
         "--target=wasm32-wasi \
-         --sysroot={sysroot} \
-         -I{sysroot}/include/wasm32-wasip1 \
+         --sysroot={sysroot_str} \
+         -I{sysroot_str}/include/wasm32-wasip1 \
          -D_WASI_EMULATED_SIGNAL \
          -D_WASI_EMULATED_PROCESS_CLOCKS \
          -fPIC \
@@ -643,7 +665,6 @@ fn build_sqlite(wasi_sdk: &Path, install_dir: &Path) -> Result<()> {
          -DSQLITE_OMIT_LOCALTIME \
          -DSQLITE_OMIT_RANDOMNESS \
          -DSQLITE_OMIT_SHARED_CACHE",
-        sysroot = sysroot_str
     );
 
     // Configure SQLite
@@ -657,12 +678,11 @@ fn build_sqlite(wasi_sdk: &Path, install_dir: &Path) -> Result<()> {
         .env(
             "LDFLAGS",
             format!(
-                "--target=wasm32-wasip2 --sysroot={sysroot} -L{sysroot}/lib",
-                sysroot = sysroot_str
+                "--target=wasm32-wasip2 --sysroot={sysroot_str} -L{sysroot_str}/lib",
             ),
         )
         .arg("--host=wasm32-wasi")
-        .arg(format!("--prefix={}", install_dir.display()))
+        .arg(format!("--prefix={install_dir_str}"))
         .arg("--disable-shared")
         .arg("--enable-static")
         .arg("--disable-readline")
@@ -678,7 +698,7 @@ fn build_sqlite(wasi_sdk: &Path, install_dir: &Path) -> Result<()> {
         .env("CC", wasi_sdk.join("bin/clang"))
         .env("RANLIB", wasi_sdk.join("bin/ranlib"))
         .env("CFLAGS", &sqlite_cflags)
-        .arg(format!("AR={}", wasi_sdk.join("bin/ar").display()))
+        .arg(format!("AR={ar_str}"))
         .arg("ARFLAGS=rcs")
         .arg("libsqlite3.a"); // Build only the static library
     run(&mut make)?;