From 26cbd17577bc9a0a245705c08b36d7f3ec50ebef Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Thu, 26 May 2016 16:32:40 +0000 Subject: [PATCH] [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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@270866 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/CMakeLists.txt | 2 -- lib/Support/CMakeLists.txt | 3 --- tools/llvm-objdump/CMakeLists.txt | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/Object/CMakeLists.txt b/lib/Object/CMakeLists.txt index b293d1c1f4e..0a37cc360fe 100644 --- a/lib/Object/CMakeLists.txt +++ b/lib/Object/CMakeLists.txt @@ -21,6 +21,4 @@ add_llvm_library(LLVMObject DEPENDS intrinsics_gen - - LINK_LIBS ${XAR_LIB} ) diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt index 3c8f78b2a00..3d718e6a11c 100644 --- a/lib/Support/CMakeLists.txt +++ b/lib/Support/CMakeLists.txt @@ -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 diff --git a/tools/llvm-objdump/CMakeLists.txt b/tools/llvm-objdump/CMakeLists.txt index d0dd4ac0182..551847f34ee 100644 --- a/tools/llvm-objdump/CMakeLists.txt +++ b/tools/llvm-objdump/CMakeLists.txt @@ -17,3 +17,7 @@ add_llvm_tool(llvm-objdump ELFDump.cpp MachODump.cpp ) + +if(HAVE_LIBXAR) + target_link_libraries(llvm-objdump ${XAR_LIB}) +endif() -- 2.11.0