Make Rust extensions work on macOS (#12)

Author: Eclips4

Modules/cpython-sys/build.rs

@@ -8,6 +8,7 @@ fn main() {
         .header("wrapper.h")
         .clang_arg(format!("-I{}", srcdir.as_os_str().to_str().unwrap()))
         .clang_arg(format!("-I{}/Include", srcdir.as_os_str().to_str().unwrap()))
+        .clang_arg(format!("-I{}/Include/internal", srcdir.as_os_str().to_str().unwrap()))
         .allowlist_function("Py.*")
         .allowlist_function("_Py.*")
         .allowlist_type("Py.*")
@@ -24,4 +25,4 @@ fn main() {
     bindings
         .write_to_file(out_path.join("bindings.rs"))
         .expect("Couldn't write bindings!");
-}
+}

Modules/makesetup

@@ -83,6 +83,8 @@ case $makepre in
 '')	makepre=Makefile.pre;;
 esac
 
+UNAME_SYSTEM=`uname -s 2>/dev/null || echo unknown`
+
 # Newline for sed i and a commands
 NL='\
 '
@@ -289,7 +291,14 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			echo "$rule" >>$rulesf
 			for mod in $mods
 			do
-				custom_ldflags="-Wl,--defsym=PyInit_$mod=PyInit_$mod"
+				case $UNAME_SYSTEM in
+				Darwin*)
+					custom_ldflags="$custom_ldflags -Wl,-u,_PyInit_$mod"
+					;;
+				*)
+					custom_ldflags="$custom_ldflags -Wl,--defsym=PyInit_$mod=PyInit_$mod"
+					;;
+				esac
 			done
 		fi
 		case $doconfig in

Python/remote_debug.h

@@ -29,6 +29,7 @@ extern "C" {
 
 #include "pyconfig.h"
 #include "internal/pycore_ceval.h"
+#include "internal/pycore_debug_offsets.h"
 
 #ifdef __linux__
 #    include <elf.h>

Tools/build/regen-rust-wrapper-h.py

@@ -3,8 +3,11 @@
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parents[2]
-INCLUDE = ROOT / "Include"
 WRAPPER_H = ROOT / "Modules" / "cpython-sys" / "wrapper.h"
+SKIP_PREFIXES = ("cpython/",)
+SKIP_EXACT = {
+    "internal/pycore_crossinterp_data_registry.h",
+}
 
 def normalize_path(header: str) -> str:
     return re.sub(r'(:?\.\/)(:?Include\/)?', '', header)
@@ -18,7 +21,13 @@ def main(output: str = WRAPPER_H) -> None:
         f.write("#include \"Modules/expat/expat.h\"\n")
         for header in headers.split():
             normalized_path = normalize_path(header)
+            if normalized_path.startswith(SKIP_PREFIXES):
+                continue
+            if normalized_path in SKIP_EXACT:
+                continue
             f.write(f"#include \"{normalized_path}\"\n")
+            if normalized_path == "Python/remote_debug.h":
+                f.write("#undef UNUSED\n")
 
 if __name__ == "__main__":
     import sys