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

[Hans Wennborg via llvm-commits]

Author: hans
Date: Fri Feb 23 04:20:26 2018
New Revision: 325894

URL: http://llvm.org/viewvc/llvm-project?rev=325894&view=rev
Log:
llvm-config: Add advapi32 to --system-libs on Windows (PR36372)

Modified:
    llvm/trunk/lib/Support/CMakeLists.txt
    llvm/trunk/test/tools/llvm-config/system-libs.windows.test

Modified: llvm/trunk/lib/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/CMakeLists.txt?rev=325894&r1=325893&r2=325894&view=diff
==============================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt (original)
+++ llvm/trunk/lib/Support/CMakeLists.txt Fri Feb 23 04:20:26 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/trunk/test/tools/llvm-config/system-libs.windows.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-config/system-libs.windows.test?rev=325894&r1=325893&r2=325894&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-config/system-libs.windows.test (original)
+++ llvm/trunk/test/tools/llvm-config/system-libs.windows.test Fri Feb 23 04:20:26 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