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

Revert 332750, llvm part (see comment on D46910). 

llvm-svn: 332823
This commit is contained in:
Nico Weber 2018-05-20 23:03:17 +00:00
parent 5062e4b1ae
commit 41597b92b1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/cmake/modules/GetHostTriple.cmake
View File

@ -4,15 +4,15 @@
function( get_host_triple var ) function( get_host_triple var )
if( MSVC ) if( MSVC )
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( value "x86_64-pc-windows-msvc" ) set( value "x86_64-pc-win32" )
else() else()
set( value "i686-pc-windows-msvc" ) set( value "i686-pc-win32" )
endif() endif()
elseif( MINGW AND NOT MSYS ) elseif( MINGW AND NOT MSYS )
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set( value "x86_64-w64-windows-gnu" ) set( value "x86_64-w64-mingw32" )
else() else()
set( value "i686-pc-windows-gnu" ) set( value "i686-pc-mingw32" )
endif() endif()
else( MSVC ) else( MSVC )
set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)

2
llvm/lib/Support/Unix/Host.inc
View File

@ -64,5 +64,5 @@ std::string sys::getDefaultTargetTriple() {
TargetTripleString = EnvTriple; TargetTripleString = EnvTriple;
#endif #endif
return TargetTripleString; return Triple::normalize(TargetTripleString);
} }

2
llvm/lib/Support/Windows/Host.inc
View File

@ -30,5 +30,5 @@ std::string sys::getDefaultTargetTriple() {
Triple = EnvTriple; Triple = EnvTriple;
#endif #endif
return Triple; return Triple::normalize(Triple);
} }