Skip to content

Commit 592adb0

Browse files
committed
[CMake] Make the vendor part of default mingw triples consistent
Consistently use 'w64' as vendor string; it was 'pc' for the original i686 triple added in 91bd6c9, but the later x86_64 triple used 'w64' as vendor, added in d6c1f37. When the arm triples were added in c84ad73, the differing vendors were copied over accidentally to the arm targets too. When using per-target runtime directories, having inconsistent vendor parts of the target triples is fatal. Differential Revision: https://reviews.llvm.org/D107894
1 parent f8340c8 commit 592adb0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

llvm/cmake/modules/GetHostTriple.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ function( get_host_triple var )
2323
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
2424
set( value "aarch64-w64-windows-gnu" )
2525
else()
26-
set( value "armv7-pc-windows-gnu" )
26+
set( value "armv7-w64-windows-gnu" )
2727
endif()
2828
else()
2929
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
3030
set( value "x86_64-w64-windows-gnu" )
3131
else()
32-
set( value "i686-pc-windows-gnu" )
32+
set( value "i686-w64-windows-gnu" )
3333
endif()
3434
endif()
3535
elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" )

0 commit comments

Comments
 (0)