[benchmark] Fix win32 link on case-sensitive fs

Summary: This fixes cross-builds with MinGW from case-sensitive file-systems (on Linux)

This is a cherry-pick from
https://github.com/google/benchmark/pull/840
https://github.com/google/benchmark/commit/8e48105d465c586068dd8e248fe75a8971c6ba3a

Original patch by: @jschueller (Julien Schueller) !

Differential Revision: https://reviews.llvm.org/D61371

llvm-svn: 367356

diff --git a/libcxx/utils/google-benchmark/README.LLVM b/libcxx/utils/google-benchmark/README.LLVM
index 6b81ddf..05c5e3e 100644 (file)
--- a/libcxx/utils/google-benchmark/README.LLVM
+++ b/libcxx/utils/google-benchmark/README.LLVM
@@ -10,3 +10,7 @@ Changes:
   is applied on top of
   https://github.com/google/benchmark/commit/4528c76b718acc9b57956f63069c699ae21edcab
   to add RISC-V timer support.
+* https://github.com/google/benchmark/commit/8e48105d465c586068dd8e248fe75a8971c6ba3a
+  is applied on top of
+  https://github.com/google/benchmark/commit/4528c76b718acc9b57956f63069c699ae21edcab
+  to fix cross-build from linux to windows via MinGW.

diff --git a/libcxx/utils/google-benchmark/src/CMakeLists.txt b/libcxx/utils/google-benchmark/src/CMakeLists.txt
index 977474f..7a77fdf 100644 (file)
--- a/libcxx/utils/google-benchmark/src/CMakeLists.txt
+++ b/libcxx/utils/google-benchmark/src/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 
 # We need extra libraries on Windows
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  target_link_libraries(benchmark Shlwapi)
+  target_link_libraries(benchmark shlwapi)
 endif()
 
 # We need extra libraries on Solaris

diff --git a/llvm/utils/benchmark/README.LLVM b/llvm/utils/benchmark/README.LLVM
index d2aa87e..e3668ce 100644 (file)
--- a/llvm/utils/benchmark/README.LLVM
+++ b/llvm/utils/benchmark/README.LLVM
@@ -25,3 +25,5 @@ Changes:
   and hardcoded a null version
 * https://github.com/google/benchmark/commit/4abdfbb802d1b514703223f5f852ce4a507d32d2
   is applied on top of v1.4.1 to add RISC-V timer support.
+* https://github.com/google/benchmark/commit/8e48105d465c586068dd8e248fe75a8971c6ba3a
+  is applied on top of v1.4.1 to fix cross-build from linux to windows via MinGW.

diff --git a/llvm/utils/benchmark/src/CMakeLists.txt b/llvm/utils/benchmark/src/CMakeLists.txt
index 5b3d522..0abfe3c 100644 (file)
--- a/llvm/utils/benchmark/src/CMakeLists.txt
+++ b/llvm/utils/benchmark/src/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
 
 # We need extra libraries on Windows
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  target_link_libraries(benchmark Shlwapi)
+  target_link_libraries(benchmark shlwapi)
 endif()
 
 # We need extra libraries on Solaris