aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Bylica <chfast@gmail.com>2017-08-21 14:19:55 +0800
committerchriseth <chris@ethereum.org>2017-08-25 21:43:00 +0800
commit6e9f93e0437d72e712a968c6d9c8973b30b4d5af (patch)
treee97286e48fa8d33400f153b47ef29bec639b1870
parente088f48c55aad32568ad6681be11dde263f4272b (diff)
downloaddexon-solidity-6e9f93e0437d72e712a968c6d9c8973b30b4d5af.tar.gz
dexon-solidity-6e9f93e0437d72e712a968c6d9c8973b30b4d5af.tar.zst
dexon-solidity-6e9f93e0437d72e712a968c6d9c8973b30b4d5af.zip
Emscripten, CI: Use CMake toolchain file
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 2b4fb4a7..9c7cbb2b 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -61,7 +61,8 @@ echo -en 'travis_fold:start:compiling_solidity\\r'
cd $WORKSPACE
mkdir -p build
cd build
-emcmake cmake \
+cmake \
+ -DCMAKE_TOOLCHAIN_FILE=$EMSCRIPTEN/cmake/Modules/Platform/Emscripten.cmake \
-DCMAKE_BUILD_TYPE=Release \
-DEMSCRIPTEN=1 \
-DBoost_FOUND=1 \
@@ -83,9 +84,8 @@ emcmake cmake \
make -j 4
cd ..
-cp build/solc/soljson.js ./
mkdir -p upload
-cp soljson.js upload/
+cp build/solc/soljson.js upload/
OUTPUT_SIZE=`ls -la build/solc/soljson.js`