Set target

Author: alex-semenyuk

Modules/cpython-sys/build.rs

@@ -12,7 +12,8 @@ fn main() {
     if gil_disabled(srcdir, builddir.as_deref()) {
         println!("cargo:rustc-cfg=py_gil_disabled");
     }
-    generate_c_api_bindings(srcdir, builddir.as_deref(), out_path.as_path());
+    let target = env::var("TARGET").unwrap_or_default();
+    generate_c_api_bindings(srcdir, builddir.as_deref(), out_path.as_path(), &target);
     // TODO(emmatyping): generate bindings to the internal parser API
     // The parser includes things slightly differently, so we should generate
     // it's bindings independently
@@ -36,9 +37,17 @@ fn gil_disabled(srcdir: &Path, builddir: Option<&str>) -> bool {
     false
 }
 
-fn generate_c_api_bindings(srcdir: &Path, builddir: Option<&str>, out_path: &Path) {
+fn generate_c_api_bindings(srcdir: &Path, builddir: Option<&str>, out_path: &Path, target: &str) {
     let mut builder = bindgen::Builder::default().header("wrapper.h");
 
+    let host = env::var("HOST").unwrap_or_default();
+    let is_cross_compiling = !target.is_empty() && target != host;
+
+    // For cross-compilation, don't auto-detect host system include paths
+    if is_cross_compiling {
+        builder = builder.detect_include_paths(false);
+    }
+
     // Always search the source dir and the public headers.
     let mut include_dirs = vec![srcdir.to_path_buf(), srcdir.join("Include")];
     // Include the build directory if provided; out-of-tree builds place
@@ -50,6 +59,32 @@ fn generate_c_api_bindings(srcdir: &Path, builddir: Option<&str>, out_path: &Pat
         builder = builder.clang_arg(format!("-I{}", dir.display()));
     }
 
+    // Set target triple for cross-compilation
+    if !target.is_empty() {
+        builder = builder.clang_arg(format!("--target={}", target));
+    }
+
+    // Handle WASI SDK sysroot and clang includes
+    if target.contains("wasi") {
+        if let Ok(wasi_sdk) = env::var("WASI_SDK_PATH") {
+            let wasi_sdk_path = PathBuf::from(&wasi_sdk);
+            let sysroot = wasi_sdk_path.join("share/wasi-sysroot");
+            if sysroot.exists() {
+                builder = builder.clang_arg(format!("--sysroot={}", sysroot.display()));
+            }
+            // Add clang's built-in headers (stddef.h, etc.) from WASI SDK
+            if let Ok(entries) = std::fs::read_dir(wasi_sdk_path.join("lib/clang")) {
+                for entry in entries.flatten() {
+                    let clang_include = entry.path().join("include");
+                    if clang_include.exists() {
+                        builder = builder.clang_arg(format!("-I{}", clang_include.display()));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     let bindings = builder
         .allowlist_function("_?Py.*")
         .allowlist_type("_?Py.*")

Modules/cpython-sys/src/lib.rs

@@ -55,7 +55,7 @@ pub const _Py_STATIC_FLAG_BITS: Py_ssize_t =
 pub const _Py_STATIC_IMMORTAL_INITIAL_REFCNT: Py_ssize_t =
     (_Py_IMMORTAL_INITIAL_REFCNT as Py_ssize_t) | (_Py_STATIC_FLAG_BITS << 48);
 #[cfg(not(target_pointer_width = "64"))]
-pub const _Py_STATIC_IMMORTAL_INITIAL_REFCNT: Py_ssize_t = 7u32 << 28;
+pub const _Py_STATIC_IMMORTAL_INITIAL_REFCNT: Py_ssize_t = (7u32 << 28) as Py_ssize_t;
 
 #[repr(transparent)]
 pub struct PyObject(std::cell::UnsafeCell<_object>);
@@ -129,14 +129,22 @@ pub const PyObject_HEAD_INIT: PyObject = {
     PyObject(std::cell::UnsafeCell::new(obj))
 };
 
-#[cfg(not(py_gil_disabled))]
+#[cfg(all(not(py_gil_disabled), target_pointer_width = "64"))]
 pub const PyObject_HEAD_INIT: PyObject = PyObject(std::cell::UnsafeCell::new(_object {
     __bindgen_anon_1: _object__bindgen_ty_1 {
         ob_refcnt_full: _Py_STATIC_IMMORTAL_INITIAL_REFCNT as i64,
     },
     ob_type: std::ptr::null_mut(),
 }));
 
+#[cfg(all(not(py_gil_disabled), not(target_pointer_width = "64")))]
+pub const PyObject_HEAD_INIT: PyObject = PyObject(std::cell::UnsafeCell::new(_object {
+    __bindgen_anon_1: _object__bindgen_ty_1 {
+        ob_refcnt: _Py_STATIC_IMMORTAL_INITIAL_REFCNT,
+    },
+    ob_type: std::ptr::null_mut(),
+}));
+
 pub const PyModuleDef_HEAD_INIT: PyModuleDef_Base = PyModuleDef_Base {
     ob_base: PyObject_HEAD_INIT,
     m_init: None,

configure

@@ -4347,7 +4347,6 @@ else
       ;;
     wasm32-unknown-wasip1)
       CARGO_TARGET=wasm32-wasip1
-      export BINDGEN_EXTRA_CLANG_ARGS_wasm32_wasip1="--sysroot=/opt/wasi-sdk/share/wasi-sysroot"
       ;;  
     *)
       CARGO_TARGET="$host"

configure.ac

@@ -1,3 +1,4 @@
 [toolchain]
 channel = "1.91.1"
 components = ["rustfmt", "clippy"]
+targets = ["wasm32-wasip1"]