Fix problems

Author: Eclips4

Modules/cpython-build-helper/src/lib.rs

@@ -7,6 +7,7 @@ pub fn print_linker_args() {
     println!("cargo:rerun-if-env-changed=BLDSHARED_EXE");
     println!("cargo:rerun-if-env-changed=BLDSHARED_ARGS");
     println!("cargo:rerun-if-env-changed=LIBPYTHON");
+    println!("cargo:rerun-if-env-changed=PY_CC");
     println!("cargo:rerun-if-env-changed=PYTHON_BUILD_DIR");
     println!("cargo:rerun-if-env-changed=CARGO_CFG_TARGET_OS");
 
@@ -60,8 +61,8 @@ pub fn print_linker_args() {
 
 fn print_link_args(raw: &str, skip_first: bool) {
     let mut args = shlex::split(raw).expect("Invalid linker args");
-    if skip_first && !args.is_empty() {
-        args.remove(0);
+    if skip_first {
+        args = strip_linker_executable(args, env::var("PY_CC").ok().as_deref());
     }
 
     let build_dir = env::var("PYTHON_BUILD_DIR").ok();
@@ -98,3 +99,26 @@ fn print_link_args(raw: &str, skip_first: bool) {
         }
     }
 }
+
+// BLDSHARED_EXE may start with a wrapper/compiler command such as
+// "xcrun --sdk iphoneos clang" or "ccache clang". Strip that prefix so only
+// linker flags are forwarded to rustc.
+fn strip_linker_executable(args: Vec<String>, compiler: Option<&str>) -> Vec<String> {
+    if let Some(compiler) = compiler
+        && let Some(prefix) = compiler_command_prefix(compiler)
+        && args.as_slice().starts_with(prefix.as_slice())
+    {
+        return args[prefix.len()..].to_vec();
+    }
+
+    if args.is_empty() {
+        return args;
+    }
+    args[1..].to_vec()
+}
+
+fn compiler_command_prefix(raw: &str) -> Option<Vec<String>> {
+    let tokens = shlex::split(raw)?;
+    let last_non_flag = tokens.iter().rposition(|token| !token.starts_with('-'))?;
+    Some(tokens.into_iter().take(last_non_flag + 1).collect())
+}

Modules/cpython-sys/build.rs

@@ -9,13 +9,37 @@ fn main() {
         .expect("expected Modules/cpython-sys to live under the source tree");
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
     let builddir = env::var("PYTHON_BUILD_DIR").ok();
+    emit_rerun_instructions(builddir.as_deref());
     if gil_disabled(srcdir, builddir.as_deref()) {
         println!("cargo:rustc-cfg=py_gil_disabled");
     }
     println!("cargo::rustc-check-cfg=cfg(py_gil_disabled)");
     generate_c_api_bindings(srcdir, builddir.as_deref(), out_path.as_path());
 }
 
+// Bindgen depends on build-time env and, on iOS, can also inherit the
+// deployment target from the generated Makefile. Declare both so Cargo reruns
+// the build script when those inputs change.
+fn emit_rerun_instructions(builddir: Option<&str>) {
+    for var in [
+        "IPHONEOS_DEPLOYMENT_TARGET",
+        "LLVM_TARGET",
+        "PYTHON_BUILD_DIR",
+        "PY_CC",
+        "PY_CPPFLAGS",
+        "PY_CFLAGS",
+        "TARGET",
+        "WASI_SDK_PATH",
+    ] {
+        println!("cargo:rerun-if-env-changed={var}");
+    }
+
+    if let Some(builddir) = builddir {
+        let makefile = Path::new(builddir).join("Makefile");
+        println!("cargo:rerun-if-changed={}", makefile.display());
+    }
+}
+
 fn gil_disabled(srcdir: &Path, builddir: Option<&str>) -> bool {
     let mut candidates = Vec::new();
     if let Some(build) = builddir {

Modules/makesetup

@@ -307,7 +307,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 					BUILT_SHARED="$BUILT_SHARED $mod"
 					# 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) IPHONEOS_DEPLOYMENT_TARGET=\$(IPHONEOS_DEPLOYMENT_TARGET) BLDSHARED_EXE=\"\$(BLDSHARED_EXE)\" BLDSHARED_ARGS=\"\$(BLDSHARED_ARGS)\" LIBPYTHON=\"\$(LIBPYTHON)\" \$(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"
+					rule="$rule; CARGO_TARGET_DIR=\$(abs_builddir)/target PYTHON_BUILD_DIR=\$(abs_builddir) PY_CC=\"\$(CC)\" RUST_SHARED_BUILD=\$(PY_ENABLE_SHARED) IPHONEOS_DEPLOYMENT_TARGET=\$(IPHONEOS_DEPLOYMENT_TARGET) BLDSHARED_EXE=\"\$(BLDSHARED_EXE)\" BLDSHARED_ARGS=\"\$(BLDSHARED_ARGS)\" LIBPYTHON=\"\$(LIBPYTHON)\" \$(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