diff options
| author | Petr Hosek <phosek@chromium.org> | 2016-09-30 06:29:28 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2016-09-30 06:29:28 +0000 |
| commit | acac3ab7797c69fcb3a55277dc59bf286351ab96 (patch) | |
| tree | c87cc162ff062a9f9cf95fd9e810796409fcb8c0 | |
| parent | f3e671e02010762ba1819ca74c231b714d65c6e2 (diff) | |
| download | bcm5719-llvm-acac3ab7797c69fcb3a55277dc59bf286351ab96.tar.gz bcm5719-llvm-acac3ab7797c69fcb3a55277dc59bf286351ab96.zip | |
[CMake] Support symlinks even with LLVM_INSTALL_TOOLCHAIN_ONLY
When LLVM_INSTALL_TOOLCHAIN_ONLY is used and LLVM_TOOLCHAIN_TOOLS
contains a tool which is a symlink, it would be ignored. This already
worked before but got broken in r282510.
Differential Revision: https://reviews.llvm.org/D25067
llvm-svn: 282844
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 51ae62da200..37b3b801912 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -1264,11 +1264,11 @@ function(add_llvm_tool_symlink name dest) set_target_properties(${target_name} PROPERTIES FOLDER Tools) # Make sure both the link and target are toolchain tools - if (NOT ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT ${dest} IN_LIST LLVM_TOOLCHAIN_TOOLS) - return() + if (${name} IN_LIST LLVM_TOOLCHAIN_TOOLS AND ${dest} IN_LIST LLVM_TOOLCHAIN_TOOLS) + set(TOOL_IS_TOOLCHAIN ON) endif() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_TOOLS ) + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) llvm_install_symlink(${name} ${dest}) endif() endif() |
