commit 27c3243fd9981a6e67fa6a46dcdb382214633b99
author Douglas Gregor <doug.gregor@gmail.com> Tue Jun 23 17:57:35 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Tue Jun 23 17:57:35 2009 +0000
tree ab89cfc44d7d6580e19a2d33465f6e167b75a382
parent 3620db86afd453bf60106e0fc31c5c24736383bf

Eliminate object-relinking support from CMake. Fixes PR 4429 and
cleans up the CMake-based build system a bit. Started by a patch from
Xerxes Rånby.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73969 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index e525674..2b9b649 100755
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -61,8 +61,10 @@
     add_dependencies(${target_name}Table_gen ${LLVM_COMMON_DEPENDS})
   endif( TABLEGEN_OUTPUT )
   include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-  add_partially_linked_object(LLVM${target_name} ${ARGN})
+  add_llvm_library(LLVM${target_name} ${ARGN} ${TABLEGEN_OUTPUT})
+  if (FALSE)
   if( TABLEGEN_OUTPUT )
     add_dependencies(LLVM${target_name} ${target_name}Table_gen)
   endif( TABLEGEN_OUTPUT )
+  endif ()
 endmacro(add_llvm_target)

cmake/modules/AddPartiallyLinkedObject.cmake

diff --git a/cmake/modules/AddPartiallyLinkedObject.cmake b/cmake/modules/AddPartiallyLinkedObject.cmake
deleted file mode 100755
index 0f92455..0000000
--- a/cmake/modules/AddPartiallyLinkedObject.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-include(LLVMProcessSources)
-
-macro(target_name_of_partially_linked_object lib var)
-  if( USE_EXPLICIT_DEPENDENCIES )
-    set(${var} ${lib})
-  else( )
-    set(${var} ${lib}_pll)
-  endif( )
-endmacro(target_name_of_partially_linked_object lib var)
-
-
-macro(add_partially_linked_object lib)
-  if( USE_EXPLICIT_DEPENDENCIES )
-    add_llvm_library( ${lib} ${ARGN})
-  else( )
-    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} )
-    if( BUILD_SHARED_LIBS AND SUPPORTS_FPIC_FLAG )
-      add_definitions(-fPIC)
-    endif()
-    add_library( ${lib} STATIC ${ALL_FILES})
-    if( LLVM_COMMON_DEPENDS )
-      add_dependencies( ${lib} ${LLVM_COMMON_DEPENDS} )
-    endif( LLVM_COMMON_DEPENDS )
-    add_custom_command(OUTPUT ${pll}
-      COMMENT "Building ${lib}.o..."
-      DEPENDS ${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}
-      )
-    target_name_of_partially_linked_object(${lib} tnplo)
-    add_custom_target(${tnplo} ALL DEPENDS ${pll})
-    set( llvm_libs ${llvm_libs} ${pll} PARENT_SCOPE)
-    set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE )
-  endif( )
-  install(FILES ${pll}
-    DESTINATION lib${LLVM_LIBDIR_SUFFIX})
-endmacro(add_partially_linked_object lib)