From f8a909c0cfe6a1ca0ef9bf952401fc561a48fc8f Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Thu, 9 Apr 2015 16:32:26 +0100 Subject: Try to fix using the compiler KLEE's configure script detected again! My first attempt in b41cf33b6b726fd97e502c5c4818f5feeea0284b was wrong because setting the CC and CXX Makefile variables in Makefile.config.in did not work because LLVM's Makefile.config would override them. Also detecting the C compiler is unnecessary because we already do this (bitcode compiler detection) --- Makefile.config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Makefile.config.in') diff --git a/Makefile.config.in b/Makefile.config.in index efedd505..fb8dbdb2 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -53,6 +53,10 @@ RUNTIME_ENABLE_PROFILING := KLEE_BITCODE_C_COMPILER := @KLEE_BITCODE_C_COMPILER@ KLEE_BITCODE_CXX_COMPILER := @KLEE_BITCODE_CXX_COMPILER@ +# Host compiler +KLEE_HOST_C_COMPILER := @KLEE_HOST_C_COMPILER@ +KLEE_HOST_CXX_COMPILER := @KLEE_HOST_CXX_COMPILER@ + # A list of "features" which tests can check for in XFAIL: TEST_FEATURE_LIST := @@ -65,11 +69,6 @@ endif # disable unwind test TEST_FEATURE_LIST += no-unwind -# Deliberately override the host compiler -# so that we use what was detected when KLEE was configured -# and not LLVM. -CC := @KLEE_HOST_C_COMPILER@ -CXX := @KLEE_HOST_CXX_COMPILER@ CFLAGS := @CFLAGS@ -Wall -g CXXFLAGS := @CXXFLAGS@ -g -Wall LDFLAGS := @LDFLAGS@ -g -- cgit 1.4.1