aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-05-15 22:57:03 +0800
committerGitHub <noreply@github.com>2018-05-15 22:57:03 +0800
commit007ecc849c917cdb5b2feaa20bbab84e0fe79104 (patch)
treea9f887db3fef8927a2422102e5e346d7f25032ac
parent1dca54244bd2bfe2c727d7fb7656844fbbf87574 (diff)
parent4aed41d9b6ae73e22db9b6b8d20c8c875fcdc2b5 (diff)
downloaddexon-solidity-007ecc849c917cdb5b2feaa20bbab84e0fe79104.tar.gz
dexon-solidity-007ecc849c917cdb5b2feaa20bbab84e0fe79104.tar.zst
dexon-solidity-007ecc849c917cdb5b2feaa20bbab84e0fe79104.zip
Merge pull request #4142 from aarlt/osx-clang-stack
cmake/EthCompilerSettings.cmake: increase stacksize for apple clang
-rw-r--r--cmake/EthCompilerSettings.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index c73536ad..683d1d2e 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -62,8 +62,9 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
# Additional Clang-specific compiler settings.
elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
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")
+ # Set stack size to 32MB - by default Apple's clang defines a stack size of 8MB.
+ # Normally 16MB is enough to run all tests, but it will exceed the stack, if -DSANITIZE=address is used.
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-stack_size -Wl,0x2000000")
endif()
# Some Linux-specific Clang settings. We don't want these for OS X.