Merge pull request #1724 from messense/fix-link-native-libraries-check

Fix `link-native-libraries` check for emscripten target
PyO3 · Aug 9, 2023 · 5ead412 · 5ead412
2 parents 66a1511 + 84b6414
commit 5ead412
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/compile.rs b/src/compile.rs
@@ -238,7 +238,11 @@ fn compile_target(
         }
     } else if target.is_emscripten() {
         // Allow user to override these default flags
-        if !rustflags.flags.iter().any(|f| f == "link-native-libraries") {
+        if !rustflags
+            .flags
+            .iter()
+            .any(|f| f.contains("link-native-libraries"))
+        {
             debug!("Setting `-Z link-native-libraries=no` for Emscripten");
             rustflags.push("-Z");
             rustflags.push("link-native-libraries=no");

diff --git a/src/upload.rs b/src/upload.rs
@@ -64,7 +64,7 @@ impl PublishOpt {
 
     /// Set to non interactive mode if we're running on CI
     pub fn non_interactive_on_ci(&mut self) {
-        if env::var("CI").map(|v| v == "true").unwrap_or_default() {
+        if !self.non_interactive && env::var("CI").map(|v| v == "true").unwrap_or_default() {
             eprintln!("🎛️ Running in non-interactive mode on CI");
             self.non_interactive = true;
         }