Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from mdboom/emsdk-rerun2 

Fix rebuilding of emsdk
This commit is contained in:
Michael Droettboom 2018-07-19 21:09:09 -04:00 committed by GitHub
parent d4862b85ce 10785faa9b
commit c61659db06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -161,7 +161,7 @@ root/.built: \
touch root/.built touch root/.built
$(CPYTHONLIB): emsdk/emsdk/emsdk/.complete $(CPYTHONLIB): emsdk/emsdk/.complete
make -C $(CPYTHONROOT) make -C $(CPYTHONROOT)
@ -173,5 +173,5 @@ build/packages.json: $(CPYTHONLIB)
make -C packages make -C packages
emsdk/emsdk/emsdk/.complete: emsdk/emsdk/.complete:
make -C emsdk make -C emsdk

4
emsdk/Makefile
View File

@ -1,9 +1,9 @@
all: emsdk/emsdk/.complete all: emsdk/.complete
# We hack the CPU_CORES, because if you use all of the cores on Circle-CI, you # We hack the CPU_CORES, because if you use all of the cores on Circle-CI, you
# run out of memory # run out of memory
emsdk/emsdk/.complete: emsdk/.complete:
if [ -d emsdk ]; then rm -rf emsdk; fi if [ -d emsdk ]; then rm -rf emsdk; fi
git clone https://github.com/juj/emsdk.git git clone https://github.com/juj/emsdk.git
sed -i -e "s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g" emsdk/emsdk sed -i -e "s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g" emsdk/emsdk