Commit 797e6eb3 authored by Josef Hrabal's avatar Josef Hrabal

merge master

parents 74275879 e97186d5
......@@ -32,8 +32,12 @@ dependencies = [
configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
# required to install extra tools in bin/
<<<<<<< HEAD
configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON -DLLVM_ENABLE_RTTI=1 "
configopts += "-DCMAKE_BUILD_TYPE=Release "
=======
configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON"
>>>>>>> e97186d5e8c19eac774b0d280ee66d007903d67a
sanity_check_paths = {
'files': ['bin/llvm-ar', 'bin/FileCheck'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment