Simplify Makefiles. Support parallel compilation.

b537908b · Michael Droettboom · 21e9a4c7 · b537908b · b537908b · b537908b
Commit b537908b authored May 16, 2018 by Michael Droettboom
8 changed files
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,13 @@ include Makefile.envs

 FILEPACKAGER=emsdk/emsdk/emscripten/incoming/tools/file_packager.py

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
 CPYTHONROOT=cpython
 CPYTHONLIB=$(CPYTHONROOT)/installs/python-$(PYVERSION)/lib/python$(PYMINOR)
-CPYTHONINC=$(CPYTHONROOT)/installs/python-$(PYVERSION)/include/python$(PYMINOR)
-HOSTPYTHON=$(CPYTHONROOT)/build/$(PYVERSION)/host/bin/python3

 CC=emcc
 CXX=em++
 OPTFLAGS=-O3
-CFLAGS=$(OPTFLAGS) -g -I$(CPYTHONINC) -Wno-warn-absolute-paths
+CFLAGS=$(OPTFLAGS) -g -I$(PYTHONINCLUDE) -Wno-warn-absolute-paths
 CXXFLAGS=$(CFLAGS) -std=c++14
 LDFLAGS=\
 	-O3 \
@@ -53,7 +49,7 @@ SIX_LIBS=$(SIX_ROOT)/six.py

 SITEPACKAGES=root/lib/python$(PYMINOR)/site-packages

-all: build/pyodide.asm.html \
+all: build/pyodide.asm.js \
 	build/pyodide.js \
 	build/pyodide_dev.js \
 	build/python.html \
@@ -64,12 +60,12 @@ all: build/pyodide.asm.html \
 	build/pandas.data


-build/pyodide.asm.html: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc \
-                        src/pyimport.bc src/pyproxy.bc src/python2js.bc \
-												src/runpython.bc src/dummy_thread.bc root/.built
+build/pyodide.asm.js: src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc \
+											src/pyimport.bc src/pyproxy.bc src/python2js.bc \
+											src/runpython.bc src/dummy_thread.bc root/.built
 	[ -d build ] || mkdir build
-	$(CC) -s EXPORT_NAME="'pyodide'" --bind -o $@ $(filter %.bc,$^) $(LDFLAGS) \
-		$(foreach d,$(wildcard root/*),--preload-file $d@/$(notdir $d))
+	$(CC) -s EXPORT_NAME="'pyodide'" --bind -o build/pyodide.asm.html $(filter %.bc,$^) \
+	  $(LDFLAGS) $(foreach d,$(wildcard root/*),--preload-file $d@/$(notdir $d))
 	rm build/pyodide.asm.asm.js
 	rm build/pyodide.asm.wasm.pre
 	rm build/pyodide.asm.html

--- a/Makefile.envs
+++ b/Makefile.envs
@@ -5,3 +5,19 @@ export EM_CONFIG = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten
 export EM_CACHE = $(PYODIDE_ROOT)/emsdk/emsdk/.emscripten_cache
 export EMSCRIPTEN = $(PYODIDE_ROOT)/emsdk/emsdk/emscripten/incoming
 export BINARYEN_ROOT = $(PYODIDE_ROOT)/emsdk/emsdk/binaryen/master_64bit_binaryen
+
+export PYVERSION=3.6.4
+export PYMINOR=$(basename $(PYVERSION))
+export HOSTPYTHONINSTALL=$(PYODIDE_ROOT)/cpython/build/$(PYVERSION)/host
+export HOSTPYTHON=$(HOSTPYTHONINSTALL)/bin/python3
+export PYTHONINCLUDE=$(PYODIDE_ROOT)/cpython/installs/python-$(PYVERSION)/include/python$(PYMINOR)
+export PLATFORMSLUG=$(shell $(HOSTPYTHON) -c "import sysconfig; print(sysconfig.get_platform())")-$(PYMINOR)
+
+export SIDE_LDFLAGS=\
+	-O3 \
+	-Werror \
+  -s EMULATED_FUNCTION_POINTERS=1 \
+  -s EMULATE_FUNCTION_POINTER_CASTS=1 \
+  -s SIDE_MODULE=1 \
+	-s WASM=1 \
+  --memory-init-file 0
--- a/cpython/Makefile
+++ b/cpython/Makefile
 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
-
 ROOT=$(abspath .)

 HOSTINSTALL=$(ROOT)/build/$(PYVERSION)/host
@@ -37,6 +34,7 @@ clean:
 	-rm -fr $(BUILD)
 	-rm -fr $(INSTALL)

+
 $(TARBALL):
 	[ -d $(ROOT)/downloads ] || mkdir $(ROOT)/downloads
 	wget -q -O $@ $(URL)

--- a/dateutil/Makefile
+++ b/dateutil/Makefile
 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
-
 DATEUTILVERSION=2.7.2

 ROOT=$(abspath .)

-HOSTPYTHONINSTALL=$(ROOT)/../cpython/build/$(PYVERSION)/host
-HOSTPYTHON=$(HOSTPYTHONINSTALL)/bin/python3$(EXE)
-
 SRC=$(ROOT)/python-dateutil-$(DATEUTILVERSION)
 BUILD=$(SRC)/build/lib/dateutil
 TARBALL=$(ROOT)/downloads/python-dateutil-$(DATEUTILVERSION).tgz

--- a/numpy/Makefile
+++ b/numpy/Makefile
 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
-
 NPYVERSION=1.14.1

 ROOT=$(abspath .)

-HOSTPYTHONINSTALL=$(ROOT)/../cpython/build/$(PYVERSION)/host
-HOSTPYTHON=$(HOSTPYTHONINSTALL)/bin/python3$(EXE)
-PYTHONINCLUDE=$(ROOT)/../cpython/installs/python-$(PYVERSION)/include/python$(PYMINOR)
-
 HOSTROOT=$(ROOT)/host
 HOSTDIR=$(HOSTROOT)/numpy-$(NPYVERSION)
 HOSTBUILD=$(HOSTDIR)/build
@@ -25,8 +18,6 @@ BUILDRANDOM=$(BUILD)/numpy/random
 ZIPFILE=$(ROOT)/downloads/numpy-$(NPYVERSION).zip
 URL=https://pypi.python.org/packages/a3/99/74aa456fc740a7e8f733af4e8302d8e61e123367ec660cd89c53a3cd4d70/numpy-1.14.1.zip

-PLATFORMSLUG=$(shell $(HOSTPYTHON) -c "import sysconfig; print(sysconfig.get_platform())")-$(PYMINOR)
-
 INCLUDE=$(HOSTDIR)/numpy/core/include
 SRC=$(HOSTDIR)/numpy/core/src
 GENINCLUDE=$(HOSTBUILD)/src.$(PLATFORMSLUG)/numpy/core/include
@@ -39,18 +30,8 @@ RANDOM_SRC=$(HOSTDIR)/numpy/random
 CC=emcc
 AR=emar
 CFLAGS=-O3 -Werror -std=c99 -DNPY_INTERNAL_BUILD=1 -DHAVE_NPY_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -I$(ROOT)/config -I$(INCLUDE) -I$(GENINCLUDE)/numpy -I$(INCLUDE)/private -I$(SRC) -I$(SRC)/.. -I$(SRC)/private -I$(SRC)/npymath -I$(SRC)/multiarray -I$(SRC)/umath -I$(SRC)/npysort -I$(PYTHONINCLUDE) -I$(GENSRC)/private -I$(GENSRC)/npymath -I$(GENSRC)/umath
-LDFLAGS=\
-	-O3 \
-	-Werror \
-  -s EMULATED_FUNCTION_POINTERS=1 \
-  -s EMULATE_FUNCTION_POINTER_CASTS=1 \
-  -s SIDE_MODULE=1 \
-	-s WASM=1 \
-  --memory-init-file 0
-
-
-all: \
-	$(BUILD)/numpy/__init__.py \
+
+OBJECTS= \
 	$(BUILDCORE)/multiarray.so \
 	$(BUILDCORE)/umath.so \
 	$(BUILDLINALG)/lapack_lite.so \
@@ -58,6 +39,9 @@ all: \
 	$(BUILDRANDOM)/mtrand.so \
 	$(BUILDFFT)/fftpack_lite.so

+all:
+	make $(BUILD)/numpy/__init__.py
+	make $(OBJECTS)

 clean:
 	rm -fr $(HOSTROOT)
@@ -210,34 +194,34 @@ MTRAND_SRC=\


 $(BUILDCORE)/multiarray.so: $(MULTIARRAY_SRC) $(NPYMATH_SRC) $(NPYSORT_SRC)
-	$(CC) $(LDFLAGS) $^ -o $(BUILDCORE)/multiarray.wasm
+	$(CC) $(SIDE_LDFLAGS) $^ -o $(BUILDCORE)/multiarray.wasm
 	mv $(BUILDCORE)/multiarray.wasm $(BUILDCORE)/multiarray.so


 $(BUILDCORE)/umath.so: $(UMATH_SRC) $(NPYMATH_SRC)
-	$(CC) $(LDFLAGS) $^ -o $(BUILDCORE)/umath.wasm
+	$(CC) $(SIDE_LDFLAGS) $^ -o $(BUILDCORE)/umath.wasm
 	mv $(BUILDCORE)/umath.wasm $(BUILDCORE)/umath.so


 $(BUILDLINALG)/lapack_lite.so: $(LAPACK_LITE_SRC) $(LAPACK_BLAS_SRC) $(NPYMATH_SRC)
-	$(CC) $(LDFLAGS) $^ -o $(BUILDLINALG)/lapack_lite.wasm
+	$(CC) $(SIDE_LDFLAGS) $^ -o $(BUILDLINALG)/lapack_lite.wasm
 	mv $(BUILDLINALG)/lapack_lite.wasm $(BUILDLINALG)/lapack_lite.so


 $(BUILDLINALG)/_umath_linalg.so: $(UMATH_LINALG_SRC) $(LAPACK_BLAS_SRC) $(NPYMATH_SRC)
-	$(CC) $(LDFLAGS) $^ -o $(BUILDLINALG)/_umath_linalg.wasm
+	$(CC) $(SIDE_LDFLAGS) $^ -o $(BUILDLINALG)/_umath_linalg.wasm
 	mv $(BUILDLINALG)/_umath_linalg.wasm $(BUILDLINALG)/_umath_linalg.so


 $(BUILDFFT)/fftpack_lite.so: $(FFTPACK_LITE_SRC)
-	$(CC) $(LDFLAGS) $^ -o $(BUILDFFT)/fftpack_lite.wasm
+	$(CC) $(SIDE_LDFLAGS) $^ -o $(BUILDFFT)/fftpack_lite.wasm
 	mv $(BUILDFFT)/fftpack_lite.wasm $(BUILDFFT)/fftpack_lite.so


 $(BUILDRANDOM)/mtrand.so: $(MTRAND_SRC)
-	$(CC) $(LDFLAGS) $^ -o $(BUILDRANDOM)/mtrand.wasm
+	$(CC) $(SIDE_LDFLAGS) $^ -o $(BUILDRANDOM)/mtrand.wasm
 	mv $(BUILDRANDOM)/mtrand.wasm $(BUILDRANDOM)/mtrand.so


-%.bc: %.c $(BUILD)/numpy/__init__.py
+%.bc: %.c
 	$(CC) $(CFLAGS) -include math.h -c $< -o $@
--- a/pandas/Makefile
+++ b/pandas/Makefile
 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
-
 PDVERSION=0.22.0
 NPYVERSION=1.14.1

 ROOT=$(abspath .)

-HOSTPYTHONINSTALL=$(ROOT)/../cpython/build/$(PYVERSION)/host
-HOSTPYTHON=$(HOSTPYTHONINSTALL)/bin/python3$(EXE)
-PYTHONINCLUDE=$(ROOT)/../cpython/installs/python-$(PYVERSION)/include/python$(PYMINOR)
-
 HOSTROOT=$(ROOT)/host
 HOSTDIR=$(HOSTROOT)/pandas-$(PDVERSION)
 HOSTBUILD=$(HOSTDIR)/build
@@ -22,24 +15,12 @@ BUILD=$(ROOT)/build/pandas
 TARBALL=$(ROOT)/downloads/pandas-$(PDVERSION).tar.gz
 URL=https://pypi.python.org/packages/08/01/803834bc8a4e708aedebb133095a88a4dad9f45bbaf5ad777d2bea543c7e/pandas-0.22.0.tar.gz

-PLATFORMSLUG=$(shell $(HOSTPYTHON) -c "import sysconfig; print(sysconfig.get_platform())")-$(PYMINOR)
-
 CC=emcc
 CXX=em++
 AR=emar
 CFLAGS=-Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -fPIC -I$(HOSTDIR)/pandas/_libs/src/klib -I$(HOSTDIR)/pandas/_libs/src -I../numpy/host/numpy-$(NPYVERSION)/numpy/core/include -I../numpy/config -I../numpy/host/numpy-$(NPYVERSION)/build/src.$(PLATFORMSLUG)/numpy/core/include/numpy -I$(PYTHONINCLUDE) -I$(HOSTDIR)/pandas/_libs/src/ujson/lib -I$(HOSTDIR)/pandas/_libs/src/datetime -Wno-unused-function
-LDFLAGS=\
-	-O3 \
-	-Werror \
-  -s EMULATED_FUNCTION_POINTERS=1 \
-  -s EMULATE_FUNCTION_POINTER_CASTS=1 \
-  -s SIDE_MODULE=1 \
-	-s WASM=1 \
-  --memory-init-file 0
-
-
-all: \
-	$(BUILD)/__init__.py \
+
+OBJECTS = \
 	$(BUILD)/_libs/algos.so \
 	$(BUILD)/_libs/groupby.so \
 	$(BUILD)/_libs/hashtable.so \
@@ -66,7 +47,12 @@ all: \
 	$(BUILD)/io/msgpack/_unpacker.so \
 	$(BUILD)/_libs/testing.so \
 	$(BUILD)/io/sas/_sas.so \
-	$(BUILD)/util/_move.so
+	$(BUILD)/util/_move.so \
+
+
+all:
+	make $(BUILD)/__init__.py
+	make $(OBJECTS)


 clean:
@@ -105,54 +91,54 @@ $(ROOT)/.patched: $(HOSTDIR)/setup.py


 $(BUILD)/_libs/lib.so: $(HOSTDIR)/pandas/_libs/lib.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/properties.so: $(HOSTDIR)/pandas/_libs/properties.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/hashtable.so: $(HOSTDIR)/pandas/_libs/hashtable.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslibs/strptime.so: \
 		$(HOSTDIR)/pandas/_libs/tslibs/strptime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime_strings.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslib.so: \
 		$(HOSTDIR)/pandas/_libs/tslib.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime_strings.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslibs/timedeltas.so: \
 		$(HOSTDIR)/pandas/_libs/tslibs/timedeltas.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslibs/timezones.so: \
 		$(HOSTDIR)/pandas/_libs/tslibs/timezones.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslibs/fields.so: \
 		$(HOSTDIR)/pandas/_libs/tslibs/fields.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime_strings.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/period.so: \
@@ -160,20 +146,20 @@ $(BUILD)/_libs/period.so: \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime_strings.bc \
 		$(HOSTDIR)/pandas/_libs/src/period_helper.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslibs/parsing.so: \
 		$(HOSTDIR)/pandas/_libs/tslibs/parsing.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/tslibs/frequencies.so: \
 		$(HOSTDIR)/pandas/_libs/tslibs/frequencies.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/index.so: \
@@ -181,88 +167,88 @@ $(BUILD)/_libs/index.so: \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime_strings.bc \
 		$(HOSTDIR)/pandas/_libs/src/period_helper.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/algos.so: \
 		$(HOSTDIR)/pandas/_libs/algos.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/groupby.so: \
 		$(HOSTDIR)/pandas/_libs/groupby.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/join.so: \
 		$(HOSTDIR)/pandas/_libs/join.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/reshape.so: \
 		$(HOSTDIR)/pandas/_libs/reshape.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/interval.so: \
 		$(HOSTDIR)/pandas/_libs/interval.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/window.so: \
 		$(HOSTDIR)/pandas/_libs/window.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/parsers.so: \
 		$(HOSTDIR)/pandas/_libs/parsers.bc \
 		$(HOSTDIR)/pandas/_libs/src/parser/tokenizer.bc \
 		$(HOSTDIR)/pandas/_libs/src/parser/io.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/sparse.so: \
 		$(HOSTDIR)/pandas/_libs/sparse.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/hashing.so: \
 		$(HOSTDIR)/pandas/_libs/hashing.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/io/sas/_sas.so: \
 		$(HOSTDIR)/pandas/io/sas/sas.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/testing.so: \
 		$(HOSTDIR)/pandas/_libs/testing.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/io/msgpack/_packer.so: \
 		$(HOSTDIR)/pandas/io/msgpack/_packer.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/io/msgpack/_unpacker.so: \
 		$(HOSTDIR)/pandas/io/msgpack/_unpacker.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/_libs/json.so: \
@@ -273,19 +259,19 @@ $(BUILD)/_libs/json.so: \
 		$(HOSTDIR)/pandas/_libs/src/ujson/lib/ultrajsondec.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime.bc \
 		$(HOSTDIR)/pandas/_libs/src/datetime/np_datetime_strings.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


 $(BUILD)/util/_move.so: \
 		$(HOSTDIR)/pandas/util/move.bc
-	$(CC) $(LDFLAGS) $^ -o tmp.wasm
-	mv tmp.wasm $@
+	$(CC) $(SIDE_LDFLAGS) $^ -o $@.wasm
+	mv $@.wasm $@


-%.bc: %.c $(BUILD)/__init__.py
+%.bc: %.c
 	$(CC) $(CFLAGS) -include src/state.h -c $< -o $@


-%.bc: %.cpp $(BUILD)/__init__.py
+%.bc: %.cpp
 	$(CXX) $(CFLAGS) -include src/state.h -c $< -o $@
--- a/pytz/Makefile
+++ b/pytz/Makefile
 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
-
 PYTZVERSION=2018.4

 ROOT=$(abspath .)

-HOSTPYTHONINSTALL=$(ROOT)/../cpython/build/$(PYVERSION)/host
-HOSTPYTHON=$(HOSTPYTHONINSTALL)/bin/python3$(EXE)
-
 SRC=$(ROOT)/pytz-$(PYTZVERSION)
 BUILD=$(SRC)/build/lib/pytz
 TARBALL=$(ROOT)/downloads/pytz-$(PYTZVERSION).tgz

--- a/six/Makefile
+++ b/six/Makefile
 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs

-PYVERSION=3.6.4
-PYMINOR=$(basename $(PYVERSION))
-
 SIXVERSION=1.11.0

 ROOT=$(abspath .)

-HOSTPYTHONINSTALL=$(ROOT)/../cpython/build/$(PYVERSION)/host
-HOSTPYTHON=$(HOSTPYTHONINSTALL)/bin/python3$(EXE)
-
 SRC=$(ROOT)/six-$(SIXVERSION)
 BUILD=$(SRC)/build/lib/six
 TARBALL=$(ROOT)/downloads/six-$(SIXVERSION).tgz