wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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
8e48105d46

Original patch by: @jschueller (Julien Schueller) !

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

llvm-svn: 367356
This commit is contained in:
Roman Lebedev 2019-07-30 20:47:59 +00:00
parent 9aff33bb95
commit 1e4a094b37
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/utils/google-benchmark/README.LLVM
View File

@ -10,3 +10,7 @@ Changes:
is applied on top of is applied on top of
https://github.com/google/benchmark/commit/4528c76b718acc9b57956f63069c699ae21edcab https://github.com/google/benchmark/commit/4528c76b718acc9b57956f63069c699ae21edcab
to add RISC-V timer support. 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.

2
libcxx/utils/google-benchmark/src/CMakeLists.txt
View File

@ -35,7 +35,7 @@ endif()
# We need extra libraries on Windows # We need extra libraries on Windows
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
target_link_libraries(benchmark Shlwapi) target_link_libraries(benchmark shlwapi)
endif() endif()
# We need extra libraries on Solaris # We need extra libraries on Solaris

2
llvm/utils/benchmark/README.LLVM
View File

@ -25,3 +25,5 @@ Changes:
and hardcoded a null version and hardcoded a null version
* https://github.com/google/benchmark/commit/4abdfbb802d1b514703223f5f852ce4a507d32d2 * https://github.com/google/benchmark/commit/4abdfbb802d1b514703223f5f852ce4a507d32d2
is applied on top of v1.4.1 to add RISC-V timer support. 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.

2
llvm/utils/benchmark/src/CMakeLists.txt
View File

@ -36,7 +36,7 @@ endif()
# We need extra libraries on Windows # We need extra libraries on Windows
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
target_link_libraries(benchmark Shlwapi) target_link_libraries(benchmark shlwapi)
endif() endif()
# We need extra libraries on Solaris # We need extra libraries on Solaris