aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/config-ix.cmake
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-07-21 00:45:20 -0700
committerStephen Hines <srhines@google.com>2014-07-21 00:45:20 -0700
commitc6a4f5e819217e1e12c458aed8e7b122e23a3a58 (patch)
tree81b7dd2bb4370a392f31d332a566c903b5744764 /cmake/config-ix.cmake
parent19c6fbb3e8aaf74093afa08013134b61fa08f245 (diff)
downloadexternal_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.zip
external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.gz
external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.bz2
Update LLVM for rebase to r212749.
Includes a cherry-pick of: r212948 - fixes a small issue with atomic calls Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'cmake/config-ix.cmake')
-rwxr-xr-xcmake/config-ix.cmake31
1 files changed, 3 insertions, 28 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 1325e79..b862ceb 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -252,15 +252,9 @@ function(llvm_find_program name)
endif(LLVM_PATH_${NAME})
endfunction()
-llvm_find_program(gv)
-llvm_find_program(circo)
-llvm_find_program(twopi)
-llvm_find_program(neato)
-llvm_find_program(fdp)
-llvm_find_program(dot)
-llvm_find_program(dotty)
-llvm_find_program(xdot xdot.py)
-llvm_find_program(Graphviz)
+if (LLVM_ENABLE_DOXYGEN)
+ llvm_find_program(dot)
+endif ()
if( LLVM_ENABLE_FFI )
find_path(FFI_INCLUDE_PATH ffi.h PATHS ${FFI_INCLUDE_DIR})
@@ -304,25 +298,6 @@ else()
set(ENABLE_PIC 0)
endif()
-find_package(LibXml2)
-if (LIBXML2_FOUND)
- set(CLANG_HAVE_LIBXML 1)
- # When cross-compiling, liblzma is not detected as a dependency for libxml2,
- # which makes linking c-index-test fail. But for native builds, all libraries
- # are installed and checked by CMake before Makefiles are generated and everything
- # works according to the plan. However, if a -llzma is added to native builds,
- # an additional requirement on the static liblzma.a is required, but will not
- # be checked by CMake, breaking native compilation.
- # Since this is only pertinent to cross-compilations, and there's no way CMake
- # can check for every foreign library on every OS, we add the dep and warn the dev.
- if ( CMAKE_CROSSCOMPILING )
- if (NOT PC_LIBXML_VERSION VERSION_LESS "2.8.0")
- message(STATUS "Adding LZMA as a dep to XML2 for cross-compilation, make sure liblzma.a is available.")
- set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} "-llzma")
- endif ()
- endif ()
-endif ()
-
check_cxx_compiler_flag("-Wno-variadic-macros" SUPPORTS_NO_VARIADIC_MACROS_FLAG)
set(USE_NO_MAYBE_UNINITIALIZED 0)