diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2019-01-18 02:42:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 02:42:00 +0800 |
| commit | 7c07e9498664c9b9dec6f332490d51c7a920de8b (patch) | |
| tree | 621c5d6dce7084740c03f1ad78fcd991f14b61a9 /cmake | |
| parent | 6de10cb9da3a81befb050ba9b883bfd4b0524cf6 (diff) | |
| parent | 5baac8470be4b82d53939e260d40f38d2fc15e6e (diff) | |
| download | dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.tar dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.tar.gz dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.tar.bz2 dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.tar.lz dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.tar.xz dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.tar.zst dexon-solidity-7c07e9498664c9b9dec6f332490d51c7a920de8b.zip | |
Merge pull request #4441 from ethereum/emscriptenBoostTest
Update emscripten version to 1.38.8.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EthCompilerSettings.cmake | 5 |
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() |