diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-05-26 16:32:40 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-05-26 16:32:40 +0000 |
| commit | 1bc0f4395caf10a46bb65ae548be19eb83f3713b (patch) | |
| tree | d2d7e0c9ff68b92fecf9637421129edac6c8bdd9 | |
| parent | 0777a93bee8dc0ec69fdbd1ff4560de35a482af8 (diff) | |
| download | bcm5719-llvm-1bc0f4395caf10a46bb65ae548be19eb83f3713b.tar.gz bcm5719-llvm-1bc0f4395caf10a46bb65ae548be19eb83f3713b.zip | |
[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.
llvm-svn: 270866
| -rw-r--r-- | llvm/lib/Object/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/Object/CMakeLists.txt b/llvm/lib/Object/CMakeLists.txt index b293d1c1f4e..0a37cc360fe 100644 --- a/llvm/lib/Object/CMakeLists.txt +++ b/llvm/lib/Object/CMakeLists.txt @@ -21,6 +21,4 @@ add_llvm_library(LLVMObject DEPENDS intrinsics_gen - - LINK_LIBS ${XAR_LIB} ) diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index 3c8f78b2a00..3d718e6a11c 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/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/llvm/tools/llvm-objdump/CMakeLists.txt b/llvm/tools/llvm-objdump/CMakeLists.txt index d0dd4ac0182..551847f34ee 100644 --- a/llvm/tools/llvm-objdump/CMakeLists.txt +++ b/llvm/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() |
