Use LIBRARY over LIBPYTHON

Author: emmatyping

Modules/cpython-sys/build.rs

@@ -2,7 +2,7 @@ use std::env;
 use std::path::{Path, PathBuf};
 
 fn main() {
-    println!("cargo::rerun-if-env-changed=LIBPYTHON");
+    println!("cargo::rerun-if-env-changed=LIBRARY");
     let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
     let srcdir = manifest_dir
         .parent()
@@ -13,7 +13,7 @@ fn main() {
     if gil_disabled(srcdir, builddir.as_deref()) {
         println!("cargo:rustc-cfg=py_gil_disabled");
     }
-    if let Ok(libpython) = env::var("LIBPYTHON")
+    if let Ok(libpython) = env::var("LIBRARY")
         && libpython.len() != 0
     {
         println!("cargo::rustc-link-lib=static={}", libpython);

Modules/makesetup

@@ -308,7 +308,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 					;;
 				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) \$(LIBPYTHON)"
+				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) \$(CARGO_HOME)/bin/cargo build --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