aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/EthCompilerSettings.cmake
diff options
context:
space:
mode:
authorDaniel Kirchner <daniel@ekpyron.org>2018-07-11 23:15:03 +0800
committerDaniel Kirchner <daniel@ekpyron.org>2019-01-18 01:31:34 +0800
commit5baac8470be4b82d53939e260d40f38d2fc15e6e (patch)
tree621c5d6dce7084740c03f1ad78fcd991f14b61a9 /cmake/EthCompilerSettings.cmake
parent6de10cb9da3a81befb050ba9b883bfd4b0524cf6 (diff)
downloaddexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.gz
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.bz2
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.lz
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.xz
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.tar.zst
dexon-solidity-5baac8470be4b82d53939e260d40f38d2fc15e6e.zip
Use emscripten 1.38.8 on both travis and circle.
Diffstat (limited to 'cmake/EthCompilerSettings.cmake')
-rw-r--r--cmake/EthCompilerSettings.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 8ffdfeb0..d05ccaff 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -100,6 +100,11 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
# Disallow deprecated emscripten build options.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s STRICT=1")
+ # Export the Emscripten-generated auxiliary methods which are needed by solc-js.
+ # Which methods of libsolc itself are exported is specified in libsolc/CMakeLists.txt.
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap','addFunction','removeFunction','Pointer_stringify','lengthBytesUTF8','_malloc','stringToUTF8','setValue']")
+ # Do not build as a WebAssembly target - we need an asm.js output.
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=0")
endif()
endif()