[PATCH] D61371: [benchmark] Fix win32 link on case-sensitive fs

[Phabricator via Phabricator via llvm-commits]

This revision was not accepted when it landed; it landed in state "Needs Revision".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL367356: [benchmark] Fix win32 link on case-sensitive fs (authored by lebedevri, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D61371?vs=197526&id=212430#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61371/new/

https://reviews.llvm.org/D61371

Files:
  libcxx/trunk/utils/google-benchmark/README.LLVM
  libcxx/trunk/utils/google-benchmark/src/CMakeLists.txt
  llvm/trunk/utils/benchmark/README.LLVM
  llvm/trunk/utils/benchmark/src/CMakeLists.txt


Index: llvm/trunk/utils/benchmark/src/CMakeLists.txt
===================================================================
--- llvm/trunk/utils/benchmark/src/CMakeLists.txt
+++ llvm/trunk/utils/benchmark/src/CMakeLists.txt
@@ -36,7 +36,7 @@
 
 # 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
Index: llvm/trunk/utils/benchmark/README.LLVM
===================================================================
--- llvm/trunk/utils/benchmark/README.LLVM
+++ llvm/trunk/utils/benchmark/README.LLVM
@@ -25,3 +25,5 @@
   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.
Index: libcxx/trunk/utils/google-benchmark/README.LLVM
===================================================================
--- libcxx/trunk/utils/google-benchmark/README.LLVM
+++ libcxx/trunk/utils/google-benchmark/README.LLVM
@@ -10,3 +10,7 @@
   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.
Index: libcxx/trunk/utils/google-benchmark/src/CMakeLists.txt
===================================================================
--- libcxx/trunk/utils/google-benchmark/src/CMakeLists.txt
+++ libcxx/trunk/utils/google-benchmark/src/CMakeLists.txt
@@ -35,7 +35,7 @@
 
 # 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61371.212430.patch
Type: text/x-patch
Size: 2155 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190730/6d04f88e/attachment.bin>