From dbe21a488ca0f99d77df6bc1c11107b12cc00d8d Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Thu, 7 Nov 2013 20:46:05 +0000 Subject: 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! --- Makefile.config.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile.config.in') 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 := -- cgit 1.4.1