OSDN Git Service

[CMake] Fix LLVM_ENABLE_EH and LLVM_ENABLE_RTTI on MSVC
authorAndrey Bokhanko <andreybokhanko@gmail.com>
Thu, 1 Sep 2016 14:39:54 +0000 (14:39 +0000)
committerAndrey Bokhanko <andreybokhanko@gmail.com>
Thu, 1 Sep 2016 14:39:54 +0000 (14:39 +0000)
Patch by Johannes Sebastian Mueller-Roemer.

Differential Revision: https://reviews.llvm.org/D23645

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@280371 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

index 9590a1b..221d9bd 100644 (file)
@@ -15,6 +15,9 @@ function(llvm_update_compile_flags name)
       message(AUTHOR_WARNING "Exception handling requires RTTI. Enabling RTTI for ${name}")
       set(LLVM_REQUIRES_RTTI ON)
     endif()
+    if(MSVC)
+      list(APPEND LLVM_COMPILE_FLAGS "/EHsc")
+    endif()
   else()
     if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
       list(APPEND LLVM_COMPILE_FLAGS "-fno-exceptions")
@@ -35,6 +38,8 @@ function(llvm_update_compile_flags name)
     elseif (MSVC)
       list(APPEND LLVM_COMPILE_FLAGS "/GR-")
     endif ()
+  elseif(MSVC)
+    list(APPEND LLVM_COMPILE_FLAGS "/GR")
   endif()
 
   # Assume that;