aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-08-02 05:40:53 +0800
committerGitHub <noreply@github.com>2016-08-02 05:40:53 +0800
commitfb90e8876f6d1172405890bee694ccc6000b9387 (patch)
treeffbe6caef83e4426971ff5733f6ea8657c2da546 /scripts
parentec97d574b1000933ab7f869cf83217f8687eef25 (diff)
parent1445284a785898f676ba1c9dddd199618297e6c3 (diff)
downloaddexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar
dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.gz
dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.bz2
dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.lz
dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.xz
dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.zst
dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.zip
Merge pull request #791 from chriseth/emscrip
Further tweaks to the build.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 5726b840..abdf401f 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -85,8 +85,8 @@ echo -en 'travis_fold:end:compiling_boost\\r'
# Build dependent components and solidity itself
echo -en 'travis_fold:start:compiling_solidity\\r'
cd $WORKSPACE
-mkdir -p build
-cd build
+mkdir -p build-emscripten
+cd build-emscripten
emcmake cmake \
-DCMAKE_BUILD_TYPE=Release \
-DEMSCRIPTEN=1 \
@@ -125,7 +125,6 @@ emcmake cmake \
emmake make -j 4
cd ..
-cp build/solc/soljson.js ./
-rm -rf build
+cp build-emscripten/solc/soljson.js ./
echo -en 'travis_fold:end:compiling_solidity\\r'