[klee-dev] Unable to build Klee with LLVM 3.8

[Cristian Cadar]

Hi Sang,

We plan to merge #729 into the mainline soon.  However, the other PR, 
#605, still needs some work.  But I hope to be able to bring support for 
3.8 into the mainline in the next few weeks.

Best,
Cristian

On 04/05/2018 22:44, Sang Phan wrote:
> Hello,
> 
> I'm using a newer Ubuntu where LLVM 3.4 is no longer available. So I'm 
> trying to build Klee with LLVM 3.8 following the instructions in this link:
> http://klee.github.io/build-llvm38/
> 
> However, I couldn't merge the pull request. After running
> 
> |git merge pull729|
> 
> I got the following errors:
> 
> Auto-merging test/Runtime/POSIX/DirSeek.c
> CONFLICT (content): Merge conflict in test/Runtime/POSIX/DirSeek.c
> Auto-merging runtime/POSIX/fd.c
> Auto-merging lib/Core/SpecialFunctionHandler.cpp
> CONFLICT (content): Merge conflict in lib/Core/SpecialFunctionHandler.cpp
> Auto-merging lib/Core/Memory.h
> CONFLICT (content): Merge conflict in lib/Core/Memory.h
> Auto-merging lib/Core/ExternalDispatcher.h
> CONFLICT (content): Merge conflict in lib/Core/ExternalDispatcher.h
> Auto-merging lib/Core/ExternalDispatcher.cpp
> CONFLICT (content): Merge conflict in lib/Core/ExternalDispatcher.cpp
> Auto-merging lib/Core/Executor.cpp
> CONFLICT (content): Merge conflict in lib/Core/Executor.cpp
> Automatic merge failed; fix conflicts and then commit the result.
> 
> It is not just trivial to delete the conflict marker, would you please 
> tell me how to fix it.
> 
> Thanks,
> Sang
> 
> 
> _______________________________________________
> klee-dev mailing list
> klee-dev at imperial.ac.uk
> https://mailman.ic.ac.uk/mailman/listinfo/klee-dev
>