[llvm-branch-commits] [llvm-branch] r325895 - Merging r325894:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Feb 23 04:22:51 2018
New Revision: 325895

URL: http://llvm.org/viewvc/llvm-project?rev=325895&view=rev
Log:
Merging r325894:
------------------------------------------------------------------------
r325894 | hans | 2018-02-23 13:20:26 +0100 (Fri, 23 Feb 2018) | 1 line

llvm-config: Add advapi32 to --system-libs on Windows (PR36372)
------------------------------------------------------------------------

Modified:
    llvm/branches/release_60/   (props changed)
    llvm/branches/release_60/lib/Support/CMakeLists.txt
    llvm/branches/release_60/test/tools/llvm-config/system-libs.windows.test

Propchange: llvm/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 23 04:22:51 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321911,321980,321991,321993-321994,322003,322016,322053,322056,322103,322106,322108,322123,322131,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323155,323190,323307,323331,323355,323369,323371,323384,323469,323515,323536,323582,323643,323671-323672,323706,323710,323759,323781,323810-323811,323813,323857,323907-323909,323913,323915,324002,324039,324110,324195,324353,324422,324449,324497,324576,324645,324746,324772,324916,324962,325049,325085,325139,325148,325168,325463,325525,325550,325654,325687,325739
+/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321911,321980,321991,321993-321994,322003,322016,322053,322056,322103,322106,322108,322123,322131,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323155,323190,323307,323331,323355,323369,323371,323384,323469,323515,323536,323582,323643,323671-323672,323706,323710,323759,323781,323810-323811,323813,323857,323907-323909,323913,323915,324002,324039,324110,324195,324353,324422,324449,324497,324576,324645,324746,324772,324916,324962,325049,325085,325139,325148,325168,325463,325525,325550,325654,325687,325739,325894

Modified: llvm/branches/release_60/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Support/CMakeLists.txt?rev=325895&r1=325894&r2=325895&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Support/CMakeLists.txt (original)
+++ llvm/branches/release_60/lib/Support/CMakeLists.txt Fri Feb 23 04:22:51 2018
@@ -4,7 +4,8 @@ if ( LLVM_ENABLE_ZLIB AND HAVE_LIBZ )
 endif()
 if( MSVC OR MINGW )
   # libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
-  set(system_libs ${system_libs} psapi shell32 ole32 uuid)
+  # advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
+  set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32)
 elseif( CMAKE_HOST_UNIX )
   if( HAVE_LIBRT )
     set(system_libs ${system_libs} rt)

Modified: llvm/branches/release_60/test/tools/llvm-config/system-libs.windows.test
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/tools/llvm-config/system-libs.windows.test?rev=325895&r1=325894&r2=325895&view=diff
==============================================================================
--- llvm/branches/release_60/test/tools/llvm-config/system-libs.windows.test (original)
+++ llvm/branches/release_60/test/tools/llvm-config/system-libs.windows.test Fri Feb 23 04:22:51 2018
@@ -2,6 +2,6 @@ RUN: llvm-config --link-static --system-
 REQUIRES: static-libs
 REQUIRES: system-windows
 CHECK-NOT: -l
-CHECK: psapi.lib shell32.lib ole32.lib uuid.lib
+CHECK: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib
 CHECK-NOT: error
 CHECK-NOT: warning