mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #791 from chriseth/emscrip
Further tweaks to the build.
This commit is contained in:
commit
fb90e8876f
@ -5,12 +5,6 @@
|
||||
#
|
||||
# http://solidity.readthedocs.org
|
||||
#
|
||||
# TODO - Merge with .travis.yml file which currently lives in the root of
|
||||
# webthree-umbrella, but actually contains the automation for the Solidity
|
||||
# Emscripten build, which will also need consolidating into here somehow.
|
||||
#
|
||||
# See https://github.com/ethereum/webthree-umbrella/blob/develop/.travis.yml
|
||||
#
|
||||
# ------------------------------------------------------------------------------
|
||||
# This file is part of cpp-ethereum.
|
||||
#
|
||||
@ -74,6 +68,8 @@ git:
|
||||
cache:
|
||||
ccache: true
|
||||
directories:
|
||||
- build
|
||||
- build-emscripten
|
||||
- boost_1_57_0
|
||||
- jsoncpp
|
||||
- cryptopp
|
||||
|
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user