diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2015-12-18 13:43:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2015-12-18 13:43:59 -0800 |
| commit | f7037892baf98635764e0baadb17963409f65165 (patch) | |
| tree | f40c6eb2a21d50f9f55addd30d4adc4518c45631 | |
| parent | 4cc1485b11726a5c6fd0eda25fe2b092f174bedb (diff) | |
| parent | e6afdf3d6c679e7cf09ca31641dbfd8fc7dcc184 (diff) | |
| download | binaryen-f7037892baf98635764e0baadb17963409f65165.tar.gz binaryen-f7037892baf98635764e0baadb17963409f65165.tar.bz2 binaryen-f7037892baf98635764e0baadb17963409f65165.zip | |
Merge pull request #11 from TheKK/makeThemWorks
Update submodules while running build.sh, and make it runs well
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | build.sh | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 59efaad30..0d0d49215 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "test/spec"] path = test/spec - url = git@github.com:WebAssembly/testsuite.git + url = https://github.com/WebAssembly/testsuite.git [submodule "test/experimental"] path = test/experimental - url = git@github.com:WebAssembly/experimental.git + url = https://github.com/WebAssembly/experimental.git @@ -1,3 +1,7 @@ +echo "updating git submodules" +git submodule sync --quiet +git submodule init --quiet +git submodule update --quiet echo "building binaryen shell" g++ -O2 -std=c++11 src/binaryen-shell.cpp src/pass.cpp src/passes/*.cpp -o bin/binaryen-shell -Isrc/ -msse2 -mfpmath=sse # use sse for math, avoid x87, necessarily for proper float rounding on 32-bit echo "building asm2wasm" @@ -9,4 +13,3 @@ g++ -O2 -std=c++11 src/s2wasm-main.cpp -o bin/s2wasm echo "building interpreter/js" em++ -std=c++11 src/wasm-js.cpp src/emscripten-optimizer/parser.cpp src/emscripten-optimizer/simple_ast.cpp src/emscripten-optimizer/optimizer-shared.cpp -o bin/wasm.js -s MODULARIZE=1 -s 'EXPORT_NAME="WasmJS"' --memory-init-file 0 -Oz -s ALLOW_MEMORY_GROWTH=1 -profiling -s DEMANGLE_SUPPORT=1 #-DWASM_JS_DEBUG -DWASM_INTERPRETER_DEBUG=2 cat src/js/post.js >> bin/wasm.js - |