Properly pass linker arguments and set up static library building

Author: emmatyping

Cargo.lock

@@ -62,6 +62,8 @@ CARGO_HOME=@CARGO_HOME@
 CARGO_TARGET_DIR=@CARGO_TARGET_DIR@
 CARGO_PROFILE=@CARGO_PROFILE@
 CARGO_TARGET=@CARGO_TARGET@
+CARGO_TARGET_LINKER_ENV=@CARGO_TARGET_LINKER_ENV@
+RUST_STATICLIB_DEP=@RUST_STATICLIB_DEP@
 
 GNULD=		@GNULD@
 
@@ -989,7 +991,7 @@ clinic-tests: check-clean-src $(srcdir)/Lib/test/clinic.test.c
 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f $(srcdir)/Lib/test/clinic.test.c
 
 # Build the interpreter
-$(BUILDPYTHON):	Programs/python.o $(LINK_PYTHON_DEPS)
+$(BUILDPYTHON):	Programs/python.o $(LINK_PYTHON_DEPS) $(RUST_STATICLIB_DEP)
 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
 
 platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt
@@ -3375,7 +3377,12 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
 # Module dependencies and platform-specific files
 
 cpython-sys: Modules/cpython-sys/Cargo.toml Modules/cpython-sys/build.rs Modules/cpython-sys/wrapper.h Modules/cpython-sys/parser.h
-	CARGO_TARGET_DIR=$(abs_builddir)/target PYTHON_BUILD_DIR=$(abs_builddir) RUST_SHARED_BUILD=\$(PY_ENABLE_SHARED) \$(CARGO_HOME)/bin/cargo build --lib --locked --package cpython-sys --profile $(CARGO_PROFILE) $(if $(CARGO_TARGET),--target=$(CARGO_TARGET)) --manifest-path $(srcdir)/Cargo.toml
+	CARGO_TARGET_DIR=$(abs_builddir)/target PYTHON_BUILD_DIR=$(abs_builddir) $(CARGO_HOME)/bin/cargo build --lib --locked --package cpython-sys --profile $(CARGO_PROFILE) $(if $(CARGO_TARGET),--target=$(CARGO_TARGET)) --manifest-path $(srcdir)/Cargo.toml
+
+RUST_STATICLIB_A= target/$(if $(CARGO_TARGET),$(CARGO_TARGET)/$(CARGO_TARGET_DIR),$(CARGO_TARGET_DIR))/libcpython_rust_staticlib.a
+
+cpython-rust-staticlib: cpython-sys
+	CARGO_TARGET_DIR=$(abs_builddir)/target PYTHON_BUILD_DIR=$(abs_builddir) $(CARGO_HOME)/bin/cargo build --lib --locked --package cpython-rust-staticlib --profile $(CARGO_PROFILE) $(if $(CARGO_TARGET),--target=$(CARGO_TARGET)) --manifest-path $(srcdir)/Cargo.toml
 
 # force rebuild when header file or module build flavor (static/shared) is changed
 MODULE_DEPS_STATIC=Modules/config.c

Makefile.pre.in

@@ -115,7 +115,6 @@ impl Drop for BorrowedBuffer {
 /// # Safety
 /// `module` must be a valid pointer of PyObject representing the module.
 /// `args` must be a valid pointer to an array of valid PyObject pointers with length `nargs`.
-#[unsafe(no_mangle)]
 pub unsafe extern "C" fn standard_b64encode(
     _module: *mut PyObject,
     args: *mut *mut PyObject,
@@ -193,13 +192,11 @@ fn standard_b64encode_impl(source: &PyObject) -> Result<*mut PyObject, ()> {
     Ok(result)
 }
 
-#[unsafe(no_mangle)]
 pub extern "C" fn _base64_clear(_obj: *mut PyObject) -> c_int {
     //TODO
     0
 }
 
-#[unsafe(no_mangle)]
 pub extern "C" fn _base64_free(_o: *mut c_void) {
     //TODO
 }

Modules/_base64/src/lib.rs

@@ -6,5 +6,4 @@ edition = "2024"
 [dependencies]
 
 [build-dependencies]
-bindgen = "0.72.1"
-cpython-build-helper = { path = "../cpython-build-helper" }
+bindgen = "0.72.1"

Modules/cpython-sys/Cargo.toml

@@ -1,10 +1,7 @@
 use std::env;
 use std::path::{Path, PathBuf};
 
-use cpython_build_helper::print_linker_args;
-
 fn main() {
-    print_linker_args();
     let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
     let srcdir = manifest_dir
         .parent()

Modules/cpython-sys/build.rs

@@ -296,22 +296,30 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			objs=
 			libs=
 
-			for mod in $mods
-			do
-				rust_shared="target/\$(if \$(CARGO_TARGET),\$(CARGO_TARGET)/\$(CARGO_TARGET_DIR),\$(CARGO_TARGET_DIR))/lib$mod\$(SHLIB_SUFFIX)"
-				file="$srcdir/$mod\$(EXT_SUFFIX)"
-				case $doconfig in
-				no)
+			case $doconfig in
+			no)
+				# Shared build: build each Rust module as a cdylib (.so)
+				for mod in $mods
+				do
+					rust_shared="target/\$(if \$(CARGO_TARGET),\$(CARGO_TARGET)/\$(CARGO_TARGET_DIR),\$(CARGO_TARGET_DIR))/lib$mod\$(SHLIB_SUFFIX)"
+					file="$srcdir/$mod\$(EXT_SUFFIX)"
 					SHAREDMODS="$SHAREDMODS $file"
 					BUILT_SHARED="$BUILT_SHARED $mod"
-					;;
-				esac
-				# depends on the headers through cpython-sys
-				rule="$rust_shared: cpython-sys \$(srcdir)/Cargo.toml \$(srcdir)/Cargo.lock \$(srcdir)/$srcdir/$manifest $prefixed_srcs \$(PYTHON_HEADERS) \$(MODULE_${mods_upper}_LDEPS) \$(LIBRARY)"
-				rule="$rule; CARGO_TARGET_DIR=\$(abs_builddir)/target PYTHON_BUILD_DIR=\$(abs_builddir) RUST_SHARED_BUILD=\$(PY_ENABLE_SHARED) \$(CARGO_HOME)/bin/cargo build -vvv --lib --locked --package ${mod} --profile \$(CARGO_PROFILE) \$(if \$(CARGO_TARGET),--target=\$(CARGO_TARGET)) --manifest-path \$(srcdir)/Cargo.toml"
-				echo "$rule" >>$rulesf
-				echo "$file: $rust_shared; mv $rust_shared $file" >>$rulesf
-			done
+					# depends on the headers through cpython-sys
+					rule="$rust_shared: cpython-sys \$(srcdir)/Cargo.toml \$(srcdir)/Cargo.lock \$(srcdir)/$srcdir/$manifest $prefixed_srcs \$(PYTHON_HEADERS) \$(MODULE_${mods_upper}_LDEPS) \$(LIBRARY)"
+					rule="$rule; CARGO_TARGET_DIR=\$(abs_builddir)/target PYTHON_BUILD_DIR=\$(abs_builddir) RUST_SHARED_BUILD=\$(PY_ENABLE_SHARED) BLDSHARED_ARGS=\"\$(BLDSHARED_ARGS)\" \$(if \$(CARGO_TARGET_LINKER_ENV),\$(CARGO_TARGET_LINKER_ENV)=\$(CC)) \$(CARGO_HOME)/bin/cargo build -vvv --lib --locked --package ${mod} --profile \$(CARGO_PROFILE) \$(if \$(CARGO_TARGET),--target=\$(CARGO_TARGET)) --manifest-path \$(srcdir)/Cargo.toml"
+					echo "$rule" >>$rulesf
+					echo "$file: $rust_shared; mv $rust_shared $file" >>$rulesf
+				done
+				;;
+			yes)
+				# Static build: Rust modules are built as part of cpython-rust-staticlib.
+				# The dependency on cpython-rust-staticlib is in Makefile.pre.in
+				# (via RUST_STATICLIB_DEP on the BUILDPYTHON rule).
+				rust_staticlib="target/\$(if \$(CARGO_TARGET),\$(CARGO_TARGET)/\$(CARGO_TARGET_DIR),\$(CARGO_TARGET_DIR))/libcpython_rust_staticlib.a"
+				LIBS="$LIBS $rust_staticlib"
+				;;
+			esac
 		fi
 	done
 

Modules/makesetup

@@ -4364,10 +4364,18 @@ else
       ;;
   esac
 fi
+dnl Compute the CARGO_TARGET_<triple>_LINKER env var name so we can
+dnl tell Cargo which linker to use for the target platform.
+if test -n "$CARGO_TARGET"; then
+  CARGO_TARGET_LINKER_ENV="CARGO_TARGET_$(echo "$CARGO_TARGET" | tr 'a-z-' 'A-Z_')_LINKER"
+else
+  CARGO_TARGET_LINKER_ENV=""
+fi
 AC_SUBST([CARGO_HOME])
 AC_SUBST([CARGO_TARGET_DIR])
 AC_SUBST([CARGO_PROFILE])
 AC_SUBST([CARGO_TARGET])
+AC_SUBST([CARGO_TARGET_LINKER_ENV])
 
 
 dnl detect sqlite3 from Emscripten emport
@@ -7882,6 +7890,15 @@ AS_CASE([$host_cpu],
 )
 AC_SUBST([MODULE_BUILDTYPE])
 
+dnl Set RUST_STATICLIB_DEP to cpython-rust-staticlib when building Rust
+dnl modules statically so that the python binary depends on it.
+if test "$HAVE_CARGO" != "no" -a "$MODULE_BUILDTYPE" = "static"; then
+  RUST_STATICLIB_DEP=cpython-rust-staticlib
+else
+  RUST_STATICLIB_DEP=
+fi
+AC_SUBST([RUST_STATICLIB_DEP])
+
 dnl _MODULE_BLOCK_ADD([VAR], [VALUE])
 dnl internal: adds $1=quote($2) to MODULE_BLOCK
 AC_DEFUN([_MODULE_BLOCK_ADD], [AS_VAR_APPEND([MODULE_BLOCK], ["$1=_AS_QUOTE([$2])$as_nl"])])