about summary refs log tree commit diff homepage
path: root/Makefile.config.in
diff options
context:
space:
mode:
authorDan Liew <daniel.liew@imperial.ac.uk>2013-11-07 20:46:05 +0000
committerDan Liew <daniel.liew@imperial.ac.uk>2013-11-08 12:00:48 +0000
commitdbe21a488ca0f99d77df6bc1c11107b12cc00d8d (patch)
tree789f839bcb672587e6ea7cf6bfa736eae08c89c3 /Makefile.config.in
parentdaa26b1240e1f17854040975f220b1d62430a8e7 (diff)
downloadklee-dbe21a488ca0f99d77df6bc1c11107b12cc00d8d.tar.gz
Fix the detection of the LLVM bitcode compiler. This is now done at KLEE
configure time, not LLVM configure time! Configure will fail without
a working LLVM bitcode compiler. The precedence of detection is as
follows:

1. Compilers set by newly added --with-llvmcc= --with-llvmcxx= configure flags.
2. Clang in LLVM build directory.
3. llvm-gcc in PATH.
4. clang in PATH.

This has been tested with llvm2.9 (llvm-gcc in PATH) and llvm3.3 (clang
built in LLVM build directory).

This addresses a major pain point for new users of KLEE who forget to
put llvm-gcc in their PATH at LLVM configure time and then are later
forced to reconfigure and rebuild LLVM just so KLEE knows the right
PATH!
Diffstat (limited to 'Makefile.config.in')
-rw-r--r--Makefile.config.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.config.in b/Makefile.config.in
index cd209127..452cc1a1 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -44,6 +44,10 @@ RUNTIME_DEBUG_SYMBOLS := @RUNTIME_DEBUG_SYMBOLS@
 RUNTIME_ENABLE_COVERAGE :=
 RUNTIME_ENABLE_PROFILING :=
 
+# Compilers used to build runtime library and run tests
+KLEE_BITCODE_C_COMPILER := @KLEE_BITCODE_C_COMPILER@
+KLEE_BITCODE_CXX_COMPILER := @KLEE_BITCODE_CXX_COMPILER@
+
 # A list of "features" which tests can check for in XFAIL:
 TEST_FEATURE_LIST :=