diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-11-13 08:33:40 -0800 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-11-13 08:33:40 -0800 |
| commit | fa8a587f1448faa867982285ecfa095d5cb052d9 (patch) | |
| tree | 789f839bcb672587e6ea7cf6bfa736eae08c89c3 /Makefile.rules | |
| parent | daa26b1240e1f17854040975f220b1d62430a8e7 (diff) | |
| parent | dbe21a488ca0f99d77df6bc1c11107b12cc00d8d (diff) | |
| download | klee-fa8a587f1448faa867982285ecfa095d5cb052d9.tar.gz | |
Merge pull request #65 from delcypher/detect-bitcode-compiler
Support for the detection of the LLVM bitcode compiler in the configure script.
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/Makefile.rules b/Makefile.rules index be1dab5d..5e954adf 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -433,24 +433,9 @@ endif # LLVM Capable Compiler #-------------------------------------------------------------------- -ifeq ($(LLVMCC_OPTION),llvm-gcc) - LLVMCC := $(LLVMGCC) - LLVMCXX := $(LLVMGXX) -else - ifeq ($(LLVMCC_OPTION),clang) - ifneq ($(CLANGPATH),) - LLVMCC := $(CLANGPATH) - LLVMCXX := $(CLANGXXPATH) - else - ifeq ($(ENABLE_BUILT_CLANG),1) - LLVMCC := $(LLVMToolDir)/clang - LLVMCXX := $(LLVMToolDir)/clang++ - endif - endif - else - LLVMCC := $(LLVMGCC) - LLVMCXX := $(LLVMGXX) - endif +# Use detected compiler at KLEE configure time, not llvm configure time +LLVMCC := $(KLEE_BITCODE_C_COMPILER) +LLVMCXX := $(KLEE_BITCODE_CXX_COMPILER) ifeq ($(wildcard $(LLVMCC)),) $(warning Provided Compiler "$(LLVMCC)" is not found. Provide full path!) @@ -458,7 +443,6 @@ else ifeq ($(wildcard $(LLVMCXX)),) $(warning Provided Compiler "$(LLVMCXX)" is not found. Provide full path!) endif -endif #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities |