diff options
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/Makefile.rules b/Makefile.rules index ef72c06c..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 @@ -692,7 +676,7 @@ TableGen = $(TBLGEN) -I $(call SYSPATH, $(PROJ_SRC_DIR)) \ -I $(call SYSPATH, $(PROJ_SRC_ROOT)/lib/Target) Archive = $(AR) $(AR.Flags) -LArchive = $(LLVMToolDir)/llvm-ar rcsf +LArchive = $(LLVMToolDir)/llvm-link ifdef RANLIB Ranlib = $(RANLIB) else @@ -1192,13 +1176,13 @@ $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMLD) \ "(internalize)" $(Verb) $(BCLinkLib) -o $(ObjDir)/$(LIBRARYNAME).internalize $(ObjectsBC) $(Verb) $(RM) -f $@ - $(Verb) $(LArchive) $@ $(ObjDir)/$(LIBRARYNAME).internalize.bc + $(Verb) $(LArchive) -o $@ $(ObjDir)/$(LIBRARYNAME).internalize.bc else $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir \ $(LLVMToolDir)/llvm-ar $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) $(Verb) $(RM) -f $@ - $(Verb) $(LArchive) $@ $(ObjectsBC) + $(Verb) $(LArchive) -o $@ $(ObjectsBC) endif |