about summary refs log tree commit diff homepage
path: root/Makefile.common
diff options
context:
space:
mode:
authorDan Liew <daniel.liew@imperial.ac.uk>2014-08-20 18:29:36 +0100
committerDaniel Dunbar <daniel@zuster.org>2014-09-14 15:41:24 -0700
commit1d3c741c7f074df863e94e9dfb70630eaadac6d2 (patch)
tree83775a93e424a77c1c8a9b388ea1ccc0a3848339 /Makefile.common
parent0aa44d4f61032836744d7a20f219af4463e99a23 (diff)
downloadklee-1d3c741c7f074df863e94e9dfb70630eaadac6d2.tar.gz
Provide --enable-cxx11 configure option to enable building with C++11.
For LLVM >= 3.5 explicitly force this to be enabled otherwise we can't
compile against LLVM.

 - Some minor tweaks to the configure logic by me (Daniel Dunbar), to ensure C++
   compiler is tested before these checks run, and to properly restore CXXFLAGS.
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common
index e5e3c18a..e6de9f1e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -30,6 +30,11 @@ endif
 # Needed to build runtime library using clang (gnu89 is the gcc default)
 C.Flags += -std=gnu89
 
+# Build using C++11 if requested
+ifeq ($(KLEE_USE_CXX11),1)
+	CXX.Flags += -std=c++11
+endif
+
 # This is filename that KLEE will look for when trying to load klee-uclibc
 KLEE_UCLIBC_BCA_NAME="klee-uclibc.bca"