diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-02-23 12:22:51 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-02-23 12:22:51 +0000 |
| commit | 72d068a93fe1cd266b091afb9d257b27a18e9be1 (patch) | |
| tree | 1421c719ffd81ad3279c69853c4b0a1494386ed5 | |
| parent | 4cc9e1df327ea8ed5f7659e48f0f787f5dd21518 (diff) | |
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)
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_60@325895 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Support/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/tools/llvm-config/system-libs.windows.test | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt index 5723f8fcf5b..d968688911e 100644 --- a/lib/Support/CMakeLists.txt +++ b/lib/Support/CMakeLists.txt @@ -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) diff --git a/test/tools/llvm-config/system-libs.windows.test b/test/tools/llvm-config/system-libs.windows.test index 2c6e03afa2d..09970cf6899 100644 --- a/test/tools/llvm-config/system-libs.windows.test +++ b/test/tools/llvm-config/system-libs.windows.test @@ -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 |