diff options
| author | chriseth <chris@ethereum.org> | 2018-02-14 12:00:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 12:00:41 +0800 |
| commit | 3155dd8058672ce8f04bc2c0f2536cb549067d0a (patch) | |
| tree | 7ddb56e276c74db30671eb17ffdde5eda027142d /scripts/travis-emscripten | |
| parent | c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40 (diff) | |
| parent | ef8292c6bb337d3c4b27836da6732b85021d1c5d (diff) | |
| download | dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.gz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.bz2 dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.lz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.xz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.zst dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.zip | |
Merge pull request #3503 from ethereum/develop
Merge develop into release for v0.4.20.
Diffstat (limited to 'scripts/travis-emscripten')
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index bf460e8e..fd643429 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -42,6 +42,15 @@ fi WORKSPACE=/root/project +# Increase nodejs stack size +if [ -e ~/.emscripten ] +then + sed -i -e 's/NODE_JS="nodejs"/NODE_JS=["nodejs", "--stack_size=8192"]/' ~/.emscripten +else + echo 'NODE_JS=["nodejs", "--stack_size=8192"]' > ~/.emscripten +fi + + # Boost echo -en 'travis_fold:start:compiling_boost\\r' cd "$WORKSPACE"/boost_1_57_0 @@ -87,8 +96,8 @@ make -j 4 cd .. mkdir -p upload -cp build/solc/soljson.js upload/ -cp build/solc/soljson.js ./ +cp build/libsolc/soljson.js upload/ +cp build/libsolc/soljson.js ./ OUTPUT_SIZE=`ls -la soljson.js` |