diff options
Diffstat (limited to 'libcxx/utils/google-benchmark')
| -rw-r--r-- | libcxx/utils/google-benchmark/README.LLVM | 4 | ||||
| -rw-r--r-- | libcxx/utils/google-benchmark/src/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 1 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 |
