From 7eb7e08403d906e7a8013e2e5d4dcac8d7eb6f5a Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Wed, 16 Jan 2019 11:35:40 -0500
Subject: [PATCH] Fix loading C++ modules

---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bdf3d9cb3..92fe32421 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,6 @@ CFLAGS=$(OPTFLAGS) -g -I$(PYTHONINCLUDE) -Wno-warn-absolute-paths
 CXXFLAGS=$(CFLAGS) -std=c++14
 
 
-# __ZNKSt3__220__vector_base_commonILb1EE20__throw_length_errorEv is in
-# EXPORTED_FUNCTIONS to keep the C++ standard library in the core, even though
-# there isn't any C++ there, for the sake of loading dynamic modules written in
-# C++, such as those in matplotlib.
 LDFLAGS=\
 	-O3 \
 	-s MODULARIZE=1 \
@@ -33,6 +29,7 @@ LDFLAGS=\
   -s EMULATE_FUNCTION_POINTER_CASTS=1 \
   -s LINKABLE=1 \
   -s EXPORT_ALL=1 \
+	-s EXPORTED_FUNCTIONS='["___cxa_guard_acquire"]' \
   -s WASM=1 \
 	-s SWAPPABLE_ASM_MODULE=1 \
 	-s USE_FREETYPE=1 \