diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2009-08-16 07:44:02 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2009-08-16 07:44:02 +0000 |
| commit | db7ff128ac44d6dff47afb31fe059825130df2f0 (patch) | |
| tree | 9592cf28e627a3b508c0b1e688f8ce03a30940be | |
| parent | 01833487c366c6d82277b6ba2d005585e4e0efe4 (diff) | |
| download | external_llvm-db7ff128ac44d6dff47afb31fe059825130df2f0.zip external_llvm-db7ff128ac44d6dff47afb31fe059825130df2f0.tar.gz external_llvm-db7ff128ac44d6dff47afb31fe059825130df2f0.tar.bz2 | |
CMake: Hopefully this will fix the build on VS. I can't replicate the
failure with VS 9.0, nmake and cmake 2.6.4. The buildbot output does
not show the patch level of cmake, it just says 2.6.
Sadly, parallel builds are broken due to recent changes on LLVM Target
libraries and its auxiliaries (TargetInfo, AsmPrinter, AsmParser). I
have a patch for stablishing the correct dependencies, but cmake is
buggy and generates makefiles that can't handle them.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79180 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32dcae7..c8e86d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,7 +266,6 @@ set(LLVM_ENUM_ASM_PRINTERS "") set(LLVM_ENUM_ASM_PARSERS "") foreach(t ${LLVM_TARGETS_TO_BUILD}) message(STATUS "Targeting ${t}") - set(CURRENT_LLVM_TARGET ${t}) add_subdirectory(lib/Target/${t}) add_subdirectory(lib/Target/${t}/TargetInfo) if( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt ) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 5971603..2c142dd 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -70,4 +70,5 @@ macro(add_llvm_target target_name) if ( TABLEGEN_OUTPUT ) add_dependencies(LLVM${target_name} ${target_name}Table_gen) endif (TABLEGEN_OUTPUT) + set(CURRENT_LLVM_TARGET LLVM${target_name} PARENT_SCOPE) endmacro(add_llvm_target) |