diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-08-09 02:16:18 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-08-09 02:16:18 +0000 |
| commit | eb46c95c3e7aeba4d183ca614fe238067eddf97f (patch) | |
| tree | bb2fec1f44eedc0e9ce644c153642732ae543cea /llvm/cmake/modules/GetHostTriple.cmake | |
| parent | 89d9cc7da964273b7f6e7656ad22bd67eb4a09ba (diff) | |
| download | bcm5719-llvm-eb46c95c3e7aeba4d183ca614fe238067eddf97f.tar.gz bcm5719-llvm-eb46c95c3e7aeba4d183ca614fe238067eddf97f.zip | |
[CMake] Use normalized Windows target triples
Changes the default Windows target triple returned by
GetHostTriple.cmake from the old environment names (which we wanted to
move away from) to newer, normalized ones. This also requires updating
all tests to use the new systems names in constraints.
Differential Revision: https://reviews.llvm.org/D47381
llvm-svn: 339307
Diffstat (limited to 'llvm/cmake/modules/GetHostTriple.cmake')
| -rw-r--r-- | llvm/cmake/modules/GetHostTriple.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake index 019188a59cc..7b842450b72 100644 --- a/llvm/cmake/modules/GetHostTriple.cmake +++ b/llvm/cmake/modules/GetHostTriple.cmake @@ -4,15 +4,15 @@ function( get_host_triple var ) if( MSVC ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set( value "x86_64-pc-win32" ) + set( value "x86_64-pc-windows-msvc" ) else() - set( value "i686-pc-win32" ) + set( value "i686-pc-windows-msvc" ) endif() elseif( MINGW AND NOT MSYS ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set( value "x86_64-w64-mingw32" ) + set( value "x86_64-w64-windows-gnu" ) else() - set( value "i686-pc-mingw32" ) + set( value "i686-pc-windows-gnu" ) endif() else( MSVC ) set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) |
