summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--make/configure.pm2
-rw-r--r--make/test/compiler.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/make/configure.pm b/make/configure.pm
index a89e139c9..2cd5beb60 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -96,7 +96,7 @@ sub __get_template_settings($$$) {
sub __test_compiler($) {
my $compiler = shift;
return 0 unless run_test("`$compiler`", !system "$compiler -v >/dev/null 2>&1");
- return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp'), 'compatible');
+ return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp', '-fno-rtti'), 'compatible');
return 1;
}
diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp
index 1c3e1d875..ae782bf03 100644
--- a/make/test/compiler.cpp
+++ b/make/test/compiler.cpp
@@ -18,8 +18,10 @@
#include <iostream>
#if defined _LIBCPP_VERSION
+# include <type_traits>
# include <unordered_map>
#else
+# include <tr1/type_traits>
# include <tr1/unordered_map>
#endif