From 70f52c0d336ac4b0ce45c9645c2d9708c37bed15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCthing?= <muething@dune-project.org>
Date: Mon, 11 May 2015 11:55:49 +0200
Subject: [PATCH] [Release][Bugfix] Fix __cxa_demangle() on recent clang
The test for __cxa_demangle(), which is used by Dune::className() to
demangle type names, doesn't work on my clang 3.6. Apparently, clang
requires the user to include <typeinfo> before <cxxabi.h>. While
classname.hh already does this, the build system tests don't, causing the
feature to get disabled on clang.
Fixed by adding the include to the build system tests.
---
cmake/modules/DuneCxaDemangle.cmake | 3 ++-
m4/dune_cxa_demangle.m4 | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/cmake/modules/DuneCxaDemangle.cmake b/cmake/modules/DuneCxaDemangle.cmake
index 9f480fa9a..7909a6775 100644
--- a/cmake/modules/DuneCxaDemangle.cmake
+++ b/cmake/modules/DuneCxaDemangle.cmake
@@ -8,7 +8,8 @@
# perform tests
include(CheckCXXSourceCompiles)
-CHECK_CXX_SOURCE_COMPILES("#include <cxxabi.h>
+CHECK_CXX_SOURCE_COMPILES("#include <typeinfo>
+#include <cxxabi.h>
int main(void){
int foobar = 0;
const char *foo = typeid(foobar).name();
diff --git a/m4/dune_cxa_demangle.m4 b/m4/dune_cxa_demangle.m4
index b84eea409..e86b65e51 100644
--- a/m4/dune_cxa_demangle.m4
+++ b/m4/dune_cxa_demangle.m4
@@ -4,6 +4,7 @@ AC_DEFUN([DUNE_CHECK_CXA_DEMANGLE],[
AC_CACHE_CHECK([for abi::__cxa_demangle], dune_cv_cxa_demangle, [
AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <typeinfo>
#include <cxxabi.h>
]],
[[
--
GitLab