diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-03-16 22:53:26 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-03-16 22:53:26 +0000 |
| commit | 4752bd3b40f4c4a15ca9eeb5122e405b17c87b3d (patch) | |
| tree | f37e7fc586208c7686297a275393fbcacbcb94de /cmake | |
| parent | b451a0cdec5a24965d122bb749671db9084b92ee (diff) | |
| download | llvm-4752bd3b40f4c4a15ca9eeb5122e405b17c87b3d.tar.gz llvm-4752bd3b40f4c4a15ca9eeb5122e405b17c87b3d.tar.bz2 llvm-4752bd3b40f4c4a15ca9eeb5122e405b17c87b3d.tar.xz | |
CMake: Build system fixes for XCode. llvm-config still causes us some serious trouble, but it's less serious than it used to be
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67056 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/modules/AddPartiallyLinkedObject.cmake | 4 | ||||
| -rwxr-xr-x | cmake/modules/LLVMConfig.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/AddPartiallyLinkedObject.cmake b/cmake/modules/AddPartiallyLinkedObject.cmake index fd5069d678..c9d96de1b9 100755 --- a/cmake/modules/AddPartiallyLinkedObject.cmake +++ b/cmake/modules/AddPartiallyLinkedObject.cmake @@ -13,7 +13,7 @@ macro(add_partially_linked_object lib) if( MSVC ) add_llvm_library( ${lib} ${ARGN}) else( MSVC ) - set(pll ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${lib}.o) + set(pll ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${lib}.o) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib) llvm_process_sources( ALL_FILES ${ARGN} ) @@ -27,7 +27,7 @@ macro(add_partially_linked_object lib) add_custom_command(OUTPUT ${pll} COMMENT "Building ${lib}.o..." DEPENDS ${lib} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp_lib/${CMAKE_CFG_INTDIR} COMMAND ar x ${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX} COMMAND ${CMAKE_LINKER} "${LLVM_PLO_FLAGS}" -r "*${CMAKE_CXX_OUTPUT_EXTENSION}" -o ${pll} COMMAND ${CMAKE_COMMAND} -E remove -f *${CMAKE_CXX_OUTPUT_EXTENSION} diff --git a/cmake/modules/LLVMConfig.cmake b/cmake/modules/LLVMConfig.cmake index 72c4dcafa4..63f9ded19f 100755 --- a/cmake/modules/LLVMConfig.cmake +++ b/cmake/modules/LLVMConfig.cmake @@ -131,7 +131,7 @@ macro(nix_llvm_config executable) if(c MATCHES ".*\\.o") get_filename_component(fn ${c} NAME) target_link_libraries(${executable} - ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${fn}) + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${fn}) else(c MATCHES ".*\\.o") string(REPLACE "-l" "" fn ${c}) target_link_libraries(${executable} ${fn}) |