From 3c08f1541de7078df5198e01a61ba4e03f522e34 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Tue, 24 Jul 2018 12:27:34 -0400 Subject: [PATCH] Fix emsdk build --- emsdk/Makefile | 1 - emsdk/patches/num_params.patch | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/emsdk/Makefile b/emsdk/Makefile index 1c7164ab1..dfd1cdbd7 100644 --- a/emsdk/Makefile +++ b/emsdk/Makefile @@ -15,7 +15,6 @@ emsdk/.complete: cd emsdk/binaryen/tag-1.38.10_64bit_binaryen/ ; \ make ; \ cd ../.. ; \ - cp binaryen/tag-1.38.10/bin/binaryen.js binaryen/tag-1.38.10_64bit_binaryen/bin ; \ ./emsdk activate --embedded --build=Release sdk-tag-1.38.10-64bit binaryen-tag-1.38.10-64bit ; \ touch .complete \ ) diff --git a/emsdk/patches/num_params.patch b/emsdk/patches/num_params.patch index da53a234e..e46c966d0 100644 --- a/emsdk/patches/num_params.patch +++ b/emsdk/patches/num_params.patch @@ -1,7 +1,7 @@ diff --git a/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp b/emsdk/binaryen/master/src/passes/FuncCastEmulation.cpp index 013e9403..d95fc282 100644 ---- a/emsdk/binaryen/tag-1.38.4/src/passes/FuncCastEmulation.cpp -+++ b/emsdk/binaryen/tag-1.38.4/src/passes/FuncCastEmulation.cpp +--- a/emsdk/binaryen/tag-1.38.10/src/passes/FuncCastEmulation.cpp ++++ b/emsdk/binaryen/tag-1.38.10/src/passes/FuncCastEmulation.cpp @@ -39,7 +39,7 @@ namespace wasm { // This should be enough for everybody. (As described above, we need this // to match when dynamically linking, and also dynamic linking is why we @@ -10,4 +10,4 @@ index 013e9403..d95fc282 100644 +static const int NUM_PARAMS = 32; // Converts a value to the ABI type of i64. - static Expression* toABI(Expression* value, Module* module) { \ No newline at end of file + static Expression* toABI(Expression* value, Module* module) {