From 6868d2e93ccbcb08faed51eacbf8f28392abc831 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Wed, 15 Jun 2022 07:27:34 -0700
Subject: [PATCH] Use -sSIDE_MODULE=2 when compiling rust (#2713)

---
 Makefile.envs              | 2 +-
 tools/rust_emcc_wrapper.py | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile.envs b/Makefile.envs
index 994fab565..77edac08f 100644
--- a/Makefile.envs
+++ b/Makefile.envs
@@ -156,7 +156,7 @@ export PYO3_CONFIG_FILE=$(PYODIDE_ROOT)/tools/pyo3_config.ini
 export RUSTFLAGS= \
 	-C relocation-model=pic \
 	-C target-feature=+mutable-globals \
-	-C link-arg=-sSIDE_MODULE=1 \
+	-C link-arg=-sSIDE_MODULE=2 \
 	-C link-arg=-sWASM_BIGINT
 
 .output_vars:
diff --git a/tools/rust_emcc_wrapper.py b/tools/rust_emcc_wrapper.py
index b64edf1bf..4c2898c75 100755
--- a/tools/rust_emcc_wrapper.py
+++ b/tools/rust_emcc_wrapper.py
@@ -4,9 +4,6 @@ import sys
 
 
 def update_args(args):
-    # https://github.com/emscripten-core/emscripten/issues/17109
-    args.insert(0, "-Wl,--no-whole-archive")
-
     # Remove -s ASSERTIONS=1
     # See https://github.com/rust-lang/rust/pull/97928
     for i in range(len(args)):
@@ -25,9 +22,6 @@ def update_args(args):
     # contains symbols that should come from the main module.
     # https://github.com/emscripten-core/emscripten/issues/17202
     args.append("-sERROR_ON_UNDEFINED_SYMBOLS=0")
-    # Seems like --no-entry should be implied by SIDE_MODULE but apparently it
-    # isn't?
-    args.append("-Wl,--no-entry")
     # Without this, the dylink section seems to get deleted which causes trouble
     # at load time.
     args.append("-Wl,--no-gc-sections")