[PATCH 1/1] Fix rtti flags with cmake
Jan Vesely
jan.vesely at rutgers.edu
Thu Jan 2 15:49:07 PST 2014
Patch by Johannes Obermayr
http://lists.freedesktop.org/archives/mesa-dev/2013-October/046582.html
Fixes http://llvm.org/bugs/show_bug.cgi?id=14200
CC: Johannes Obermayr <johannesobermayr at gmx.de>
CC: Alexander von Gluck <kallisti5 at unixzen.com>
CC: Bill Wendling <isanbard at gmail.com>
---
Hi,
I have been using this patch for some time with
no problems (local build of git master). Comment
on #14200 requests to send the patch to ML,
so here it goes.
regards,
Jan
tools/llvm-config/CMakeLists.txt | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
index e653b77..258f62c 100644
--- a/tools/llvm-config/CMakeLists.txt
+++ b/tools/llvm-config/CMakeLists.txt
@@ -1,3 +1,5 @@
+include(LLVMProcessSources)
+
set(LLVM_LINK_COMPONENTS support)
set(BUILDVARIABLES_SRCPATH ${CMAKE_CURRENT_SOURCE_DIR}/BuildVariables.inc.in)
@@ -20,6 +22,21 @@ set(LLVM_LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS})
set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}")
+
+# Set common compiler options:
+if( NOT LLVM_REQUIRES_EH )
+ if( MSVC )
+ llvm_replace_compiler_option(LLVM_CXXFLAGS "/EHsc" "/EHs-c-")
+ endif()
+endif()
+if( NOT LLVM_REQUIRES_RTTI )
+ if( LLVM_COMPILER_IS_GCC_COMPATIBLE )
+ llvm_replace_compiler_option(LLVM_CXXFLAGS "-frtti" "-fno-rtti")
+ elseif( MSVC )
+ llvm_replace_compiler_option(LLVM_CXXFLAGS "/GR" "/GR-")
+ endif()
+endif()
+
configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY)
# Set build-time environment(s).
--
1.8.4.2
More information about the llvm-commits
mailing list