diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2015-12-10 16:38:06 +0100 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2015-12-10 16:38:06 +0100 |
| commit | 1f185b0b87b364cd8ac3c9af2622b674480653f1 (patch) | |
| tree | 84341756149471377a4ba36375d10eb60bd17e51 | |
| parent | cb25307b3022b67cf240ff534f05778845090921 (diff) | |
| parent | 66f2dc336b476e76e91bb3291d029ecc2e4b04dc (diff) | |
| download | coreclr-1f185b0b87b364cd8ac3c9af2622b674480653f1.tar.gz coreclr-1f185b0b87b364cd8ac3c9af2622b674480653f1.tar.bz2 coreclr-1f185b0b87b364cd8ac3c9af2622b674480653f1.zip | |
Merge pull request #2292 from janvorli/fix-exception-handling-by-cpp
Fix C++ exception handling when coreclr is loaded before C++ runtime
| -rw-r--r-- | src/pal/src/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index ad5425b8df..b460665f61 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -203,11 +203,8 @@ add_library(coreclrpal ) if(CMAKE_SYSTEM_NAME STREQUAL Linux) - # On ARM linking with libunwind will break C++ exceptions unless we first - # link with gcc_s, this is a libunwind issue if(PAL_CMAKE_PLATFORM_ARCH_ARM) target_link_libraries(coreclrpal - gcc_s unwind-arm ) endif() @@ -219,6 +216,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) endif() target_link_libraries(coreclrpal + gcc_s pthread rt dl |