diff options
| author | chriseth <chris@ethereum.org> | 2018-05-16 20:43:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 20:43:57 +0800 |
| commit | e67f0147998a9e3835ed3ce8bf6a0a0c634216c5 (patch) | |
| tree | b9c0b7d41cd9f78ae3404704a888da30e767edbe /scripts/travis-emscripten/build_emscripten.sh | |
| parent | 124ca40dc525a987a88176c6e5170978e82fa290 (diff) | |
| parent | 1e45d3ab2e0ca688c2ae48ab657f11496ccebc12 (diff) | |
| download | dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.gz dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.bz2 dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.lz dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.xz dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.tar.zst dexon-solidity-e67f0147998a9e3835ed3ce8bf6a0a0c634216c5.zip | |
Merge pull request #4148 from ethereum/develop
Merge develop into release for 0.4.24
Diffstat (limited to 'scripts/travis-emscripten/build_emscripten.sh')
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index fd643429..f49ff5b2 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -40,6 +40,12 @@ if ! type git &>/dev/null; then apt-get -y install git-core fi +if ! type wget &>/dev/null; then + # We need wget to install cmake + apt-get update + apt-get -y install wget +fi + WORKSPACE=/root/project # Increase nodejs stack size @@ -67,6 +73,10 @@ rm -rf b2 libs doc tools more bin.v2 status ) echo -en 'travis_fold:end:compiling_boost\\r' +echo -en 'travis_fold:start:install_cmake.sh\\r' +source $WORKSPACE/scripts/install_cmake.sh +echo -en 'travis_fold:end:install_cmake.sh\\r' + # Build dependent components and solidity itself echo -en 'travis_fold:start:compiling_solidity\\r' cd $WORKSPACE |