aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-04-22 18:59:09 +0800
committerchriseth <c@ethdev.com>2015-04-22 20:38:00 +0800
commit5fff87cf2b747f5ca5446aeab387ebca52080ea6 (patch)
tree2ff4069a948a11ebbce7e09541e7180f63b8bdc8
parentbe3f9e26814c2ea57ad42f5893802e7213d64dce (diff)
downloaddexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.tar
dexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.tar.gz
dexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.tar.bz2
dexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.tar.lz
dexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.tar.xz
dexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.tar.zst
dexon-solidity-5fff87cf2b747f5ca5446aeab387ebca52080ea6.zip
Modifications to docker file to build the json compiler.
-rw-r--r--docker_emscripten/Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker_emscripten/Dockerfile b/docker_emscripten/Dockerfile
index 1ad1875d..23a0caba 100644
--- a/docker_emscripten/Dockerfile
+++ b/docker_emscripten/Dockerfile
@@ -63,9 +63,9 @@ RUN git remote add -f solidityjs https://github.com/chriseth/cpp-ethereum
# NOTE that we only get the latest commit of that branch
RUN git cherry-pick solidityjs/solidity-js
RUN emcmake cmake -DETH_STATIC=1 -DSOLIDITY=ON -DGUI=0 -DCMAKE_CXX_COMPILER=/home/user/emsdk_portable/emscripten/master/em++ -DCMAKE_C_COMPILER=/home/user/emsdk_portable/emscripten/master/emcc
-RUN emmake make -j 6 soljs
+RUN emmake make -j 6 soljson
-WORKDIR /home/user/cpp-ethereum/soljs
+WORKDIR /home/user/cpp-ethereum/solc
# somehow it does not work to pipe out both files
-#ENTRYPOINT tar -c soljs.js soljs.js.mem | base64
+#ENTRYPOINT tar -c soljson.js soljson.js.mem | base64