diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-02-13 08:13:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 08:13:09 +0800 |
| commit | c7ce6db32a3a5ea8d74c6cc1f866a214a6393b41 (patch) | |
| tree | ce98932952a2ffe5d31b2dc9895d584651cb6184 | |
| parent | 954903b50540456906fd7ba909d7d663e2bd7a7f (diff) | |
| parent | b4f99312e6bbc5993fd7c86f625bb8927b3d5f18 (diff) | |
| download | dexon-solidity-c7ce6db32a3a5ea8d74c6cc1f866a214a6393b41.tar.gz dexon-solidity-c7ce6db32a3a5ea8d74c6cc1f866a214a6393b41.tar.zst dexon-solidity-c7ce6db32a3a5ea8d74c6cc1f866a214a6393b41.zip | |
Merge pull request #3477 from ethereum/emscripten-exceptions
Disable greedy exception catcher in Emscripten build
| -rw-r--r-- | cmake/EthCompilerSettings.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index ddb6c426..7199f537 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -120,7 +120,7 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA endif() if (EMSCRIPTEN) - # Do emit a separate memory initialiser file + # Do not emit a separate memory initialiser file set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --memory-init-file 0") # Leave only exported symbols as public and agressively remove others set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -ffunction-sections -Wl,--gc-sections -fvisibility=hidden") @@ -138,6 +138,8 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ALLOW_MEMORY_GROWTH=1") # Disable eval() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DYNAMIC_EXECUTION=1") + # Disable greedy exception catcher + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NODEJS_CATCH_EXIT=0") add_definitions(-DETH_EMSCRIPTEN=1) endif() endif() |