diff --git a/Makefile b/Makefile
index e2f7d31a8..433f0a318 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,15 @@ LDFLAGS=\
 	-O3 \
 	-s MODULARIZE=1 \
 	$(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/libpython$(PYMINOR).a \
-  lz4/lz4-1.8.3/lib/liblz4.a \
+  $(LZ4LIB) \
   -s "BINARYEN_METHOD='native-wasm'" \
   -s TOTAL_MEMORY=1073741824 \
   -s ALLOW_MEMORY_GROWTH=1 \
 	-s MAIN_MODULE=1 \
 	-s EMULATED_FUNCTION_POINTERS=1 \
   -s EMULATE_FUNCTION_POINTER_CASTS=1 \
-  -s EXPORTED_FUNCTIONS='["_main", "__ZNKSt3__220__vector_base_commonILb1EE20__throw_length_errorEv", "__ZNSt11logic_errorC2EPKc"]' \
+  -s LINKABLE=1 \
+  -s EXPORT_ALL=1 \
   -s WASM=1 \
 	-s SWAPPABLE_ASM_MODULE=1 \
 	-s USE_FREETYPE=1 \
@@ -41,7 +42,8 @@ LDFLAGS=\
   --memory-init-file 0 \
   -s "BINARYEN_TRAP_MODE='clamp'" \
   -s TEXTDECODER=0 \
-  -s LZ4=1
+  -s LZ4=1 \
+  --profiling
 
 SIX_ROOT=six/six-1.11.0/build/lib
 SIX_LIBS=$(SIX_ROOT)/six.py
diff --git a/Makefile.envs b/Makefile.envs
index 0961e5e09..eee1b79ba 100644
--- a/Makefile.envs
+++ b/Makefile.envs
@@ -24,4 +24,6 @@ export SIDE_LDFLAGS=\
   -s SIDE_MODULE=1 \
 	-s WASM=1 \
   -s "BINARYEN_TRAP_MODE='clamp'" \
-  --memory-init-file 0
+  --memory-init-file 0 \
+  -s LINKABLE=1 \
+  -s EXPORT_ALL=1