[llvm] r270866 - [CMake] Restrict libxar linkage to just llvm-objdump

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Thu May 26 11:32:40 2016
New Revision: 270866

URL: http://llvm.org/viewvc/llvm-project?rev=270866&view=rev
Log:
[CMake] Restrict libxar linkage to just llvm-objdump

At some point we're going to need libObject to have this dependency, but as it is now this is causing too many headaches. This commit will reduce the linkage to just llvm-objdump where it is strictly needed, and we'll cross the libObject bridge later when we need it.

Modified:
    llvm/trunk/lib/Object/CMakeLists.txt
    llvm/trunk/lib/Support/CMakeLists.txt
    llvm/trunk/tools/llvm-objdump/CMakeLists.txt

Modified: llvm/trunk/lib/Object/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/CMakeLists.txt?rev=270866&r1=270865&r2=270866&view=diff
==============================================================================
--- llvm/trunk/lib/Object/CMakeLists.txt (original)
+++ llvm/trunk/lib/Object/CMakeLists.txt Thu May 26 11:32:40 2016
@@ -21,6 +21,4 @@ add_llvm_library(LLVMObject
 
   DEPENDS
   intrinsics_gen
-
-  LINK_LIBS ${XAR_LIB}
   )

Modified: llvm/trunk/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=270866&r1=270865&r2=270866&view=diff
==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Thu May 26 11:32:40 2016
@@ -24,9 +24,6 @@ elseif( CMAKE_HOST_UNIX )
   if( UNIX AND NOT (BEOS OR HAIKU) )
     set(system_libs ${system_libs} m)
   endif()
-  if(HAVE_LIBXAR)
-    list(APPEND system_libs ${XAR_LIB})
-  endif()
 endif( MSVC OR MINGW )
 
 add_llvm_library(LLVMSupport

Modified: llvm/trunk/tools/llvm-objdump/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/CMakeLists.txt?rev=270866&r1=270865&r2=270866&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-objdump/CMakeLists.txt Thu May 26 11:32:40 2016
@@ -17,3 +17,7 @@ add_llvm_tool(llvm-objdump
   ELFDump.cpp
   MachODump.cpp
   )
+
+if(HAVE_LIBXAR)
+  target_link_libraries(llvm-objdump ${XAR_LIB})
+endif()