[llvm] r367356 - [benchmark] Fix win32 link on case-sensitive fs
Roman Lebedev via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 30 13:47:59 PDT 2019
Author: lebedevri
Date: Tue Jul 30 13:47:59 2019
New Revision: 367356
URL: http://llvm.org/viewvc/llvm-project?rev=367356&view=rev
Log:
[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
Modified:
llvm/trunk/utils/benchmark/README.LLVM
llvm/trunk/utils/benchmark/src/CMakeLists.txt
Modified: llvm/trunk/utils/benchmark/README.LLVM
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/benchmark/README.LLVM?rev=367356&r1=367355&r2=367356&view=diff
==============================================================================
--- llvm/trunk/utils/benchmark/README.LLVM (original)
+++ llvm/trunk/utils/benchmark/README.LLVM Tue Jul 30 13:47:59 2019
@@ -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.
Modified: llvm/trunk/utils/benchmark/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/benchmark/src/CMakeLists.txt?rev=367356&r1=367355&r2=367356&view=diff
==============================================================================
--- llvm/trunk/utils/benchmark/src/CMakeLists.txt (original)
+++ llvm/trunk/utils/benchmark/src/CMakeLists.txt Tue Jul 30 13:47:59 2019
@@ -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
More information about the llvm-commits
mailing list