| commit | c45ad92a3565224aa27b0230b00a9fe6f1a05063 | [log] [tgz] |
|---|---|---|
| author | Roman Lebedev <lebedev.ri@gmail.com> | Tue Jul 30 20:47:59 2019 +0000 |
| committer | Roman Lebedev <lebedev.ri@gmail.com> | Tue Jul 30 20:47:59 2019 +0000 |
| tree | c27c3e9846483777993927df5b769c1a5e014472 | |
| parent | 392947ba1b443cb7d3d835adf357c425c1513b00 [diff] |
[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 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@367356 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/google-benchmark/README.LLVM b/utils/google-benchmark/README.LLVM index 6b81ddf..05c5e3e 100644 --- a/utils/google-benchmark/README.LLVM +++ b/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.
diff --git a/utils/google-benchmark/src/CMakeLists.txt b/utils/google-benchmark/src/CMakeLists.txt index 977474f..7a77fdf 100644 --- a/utils/google-benchmark/src/CMakeLists.txt +++ b/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