[llvm-branch-commits] [llvm-branch] r369335 - Merging r369011:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 20 00:26:05 2019
New Revision: 369335

URL: http://llvm.org/viewvc/llvm-project?rev=369335&view=rev
Log:
Merging r369011:
------------------------------------------------------------------------
r369011 | bogner | 2019-08-15 17:36:13 +0200 (Thu, 15 Aug 2019) | 4 lines

[cmake] install_symlink should obey DESTDIR unconditionally

Setting DESTDIR was erroneously buried under a condition here - if
it's set it should always be used.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/cmake/modules/LLVMInstallSymlink.cmake

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 20 00:26:05 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367019,367030,367062,367084,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367417,367662,367750,367753,367846-367847,367898,367941,368004,368230,368300,368315,368324,368477-368478,368517-368519,368554,368572,368873
+/llvm/trunk:155241,366431,366481,366487,366527,366570,366660,366868,366925,367019,367030,367062,367084,367124,367215,367292,367304,367306,367314,367340-367341,367394,367396,367398,367403,367417,367662,367750,367753,367846-367847,367898,367941,368004,368230,368300,368315,368324,368477-368478,368517-368519,368554,368572,368873,369011

Modified: llvm/branches/release_90/cmake/modules/LLVMInstallSymlink.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/cmake/modules/LLVMInstallSymlink.cmake?rev=369335&r1=369334&r2=369335&view=diff
==============================================================================
--- llvm/branches/release_90/cmake/modules/LLVMInstallSymlink.cmake (original)
+++ llvm/branches/release_90/cmake/modules/LLVMInstallSymlink.cmake Tue Aug 20 00:26:05 2019
@@ -3,9 +3,9 @@
 # See PR8397.
 
 function(install_symlink name target outdir)
+  set(DESTDIR $ENV{DESTDIR})
   if(CMAKE_HOST_UNIX)
     set(LINK_OR_COPY create_symlink)
-    set(DESTDIR $ENV{DESTDIR})
   else()
     set(LINK_OR_COPY copy)
   endif()