[llvm] d93a11c - Revert "[llvm][cmake] Make `llvm_install_symlink` robust to absolute dirs."

John Ericson via llvm-commits llvm-commits at lists.llvm.org
Thu Jan 20 18:49:47 PST 2022


Author: John Ericson
Date: 2022-01-21T02:48:10Z
New Revision: d93a11c138bb57f0ecca234867dc65eed35ccba3

URL: https://github.com/llvm/llvm-project/commit/d93a11c138bb57f0ecca234867dc65eed35ccba3
DIFF: https://github.com/llvm/llvm-project/commit/d93a11c138bb57f0ecca234867dc65eed35ccba3.diff

LOG: Revert "[llvm][cmake] Make `llvm_install_symlink` robust to absolute dirs."

https://lab.llvm.org/buildbot/#/builders/36/builds/16668 was the sort of
thing I saw before when this was part of D99484, and it makes some sense
now this would have something to do with it.

This reverts commit 58580e922a69d94859a2506c3053d8c066a1e38c.

Added: 
    

Modified: 
    llvm/cmake/modules/LLVMInstallSymlink.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake
index ef7f5ab5288de..b5c35f706cb7e 100644
--- a/llvm/cmake/modules/LLVMInstallSymlink.cmake
+++ b/llvm/cmake/modules/LLVMInstallSymlink.cmake
@@ -6,8 +6,7 @@ include(GNUInstallDirs)
 
 function(install_symlink name target outdir)
   set(DESTDIR $ENV{DESTDIR})
-  GNUInstallDirs_get_absolute_install_dir(bindir "${outdir}" BINDIR)
-  set(bindir "${DESTDIR}${bindir}")
+  set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}")
 
   message(STATUS "Creating ${name}")
 


        


More information about the llvm-commits mailing list