diff options
| author | Roman Lebedev <lebedev.ri@gmail.com> | 2019-07-30 20:47:59 +0000 |
|---|---|---|
| committer | Roman Lebedev <lebedev.ri@gmail.com> | 2019-07-30 20:47:59 +0000 |
| commit | 1e4a094b37a1aa32d860dd036dd7f1fffb18ba9c (patch) | |
| tree | 9151679484fc267a7b0b754781a64023c2dbb12b | |
| parent | 9aff33bb95034ded5a6df01ca12f4d5cc0afc277 (diff) | |
| download | bcm5719-llvm-1e4a094b37a1aa32d860dd036dd7f1fffb18ba9c.tar.gz bcm5719-llvm-1e4a094b37a1aa32d860dd036dd7f1fffb18ba9c.zip | |
[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
| -rw-r--r-- | libcxx/utils/google-benchmark/README.LLVM | 4 | ||||
| -rw-r--r-- | libcxx/utils/google-benchmark/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/utils/benchmark/README.LLVM | 2 | ||||
| -rw-r--r-- | llvm/utils/benchmark/src/CMakeLists.txt | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/libcxx/utils/google-benchmark/README.LLVM b/libcxx/utils/google-benchmark/README.LLVM index 6b81ddf873a..05c5e3ee343 100644 --- 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 977474f43f2..7a77fdf41de 100644 --- 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 d2aa87e86e7..e3668ce5c08 100644 --- 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 5b3d52270de..0abfe3cfd53 100644 --- 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 |
