Commit 105dd774 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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)
------------------------------------------------------------------------

llvm-svn: 325895
parent 744fb0a0

llvm/lib/Support/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -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)

llvm/test/tools/llvm-config/system-libs.windows.test

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ RUN: llvm-config --link-static --system-libs 2>&1 | FileCheck %s 
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