diff options
| author | chriseth <chris@ethereum.org> | 2018-02-09 17:23:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 17:23:48 +0800 |
| commit | 56a96213b1644a172204d69b648269f0fe720fab (patch) | |
| tree | 56d99c272ec8912ac5b5c24fd3b875bb4224dde0 | |
| parent | 0084777038a88109bbe7cc717820e26ad040bda2 (diff) | |
| parent | d9c51f9ca1aa48696c148fd9e3abff83777b8280 (diff) | |
| download | dexon-solidity-56a96213b1644a172204d69b648269f0fe720fab.tar.gz dexon-solidity-56a96213b1644a172204d69b648269f0fe720fab.tar.zst dexon-solidity-56a96213b1644a172204d69b648269f0fe720fab.zip | |
Merge pull request #3462 from aarlt/darwin_clang_16mb_stack
Set stack-size to 16MB for darwin clang.
| -rw-r--r-- | cmake/EthCompilerSettings.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index 6d4dadeb..ddb6c426 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -93,10 +93,15 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA # testing on at least OS X and Ubuntu. add_compile_options(-Wno-unused-function) add_compile_options(-Wno-dangling-else) - + + if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") + # Set stack size to 16MB - by default Apple's clang defines a stack size of 8MB, some tests require more. + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-stack_size -Wl,0x1000000") + endif() + # Some Linux-specific Clang settings. We don't want these for OS X. if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - + # TODO - Is this even necessary? Why? # See http://stackoverflow.com/questions/19774778/when-is-it-necessary-to-use-use-the-flag-stdlib-libstdc. add_compile_options(-stdlib=libstdc++) |