diff --git a/src/compile.rs b/src/compile.rs
index 759a6d49a..cf96bee8e 100644
--- 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
index a676ceadd..ca08197ec 100644
--- 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;
         }