Revert changes other than to scipy

pyodide · Aug 31, 2022 · 19bcdf1 · 19bcdf1
1 parent 87d8462
commit 19bcdf1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/js/load-package.ts b/src/js/load-package.ts
@@ -226,7 +226,7 @@ async function installPackage(
     source: channel === DEFAULT_CHANNEL ? "pyodide" : channel,
   });
   for (const dynlib of dynlibs) {
-    await loadDynlib(dynlib);
+    await loadDynlib(dynlib, pkg.shared_library);
   }
 }
 
@@ -269,7 +269,7 @@ const acquireDynlibLock = createLock();
  * @param shared Is this a shared library or not?
  * @private
  */
-async function loadDynlib(lib: string) {
+async function loadDynlib(lib: string, shared: boolean) {
   const node = Module.FS.lookupPath(lib).node;
   let byteArray;
   if (node.mount.type == Module.FS.filesystems.MEMFS) {
@@ -301,6 +301,12 @@ async function loadDynlib(lib: string) {
     });
     Module.preloadedWasm[lib] = module;
     Module.preloadedWasm[lib.split("/").pop()!] = module;
+    if (shared) {
+      Module.loadDynamicLibrary(lib, {
+        global: true,
+        nodelete: true,
+      });
+    }
   } catch (e: any) {
     if (e && e.message && e.message.includes("need to see wasm magic number")) {
       console.warn(