This is an archive of the discontinued LLVM Phabricator instance.

Differential D63834

[cmake] Allow config.guess to be run with MSYS on Windows
ClosedPublic

Authored by pzheng on Jun 26 2019, 11:37 AM.

Details

Reviewers
compnerd
Commits
rG4030631bfa24: [cmake] Allow config.guess to be run with MSYS on Windows
rL364485: [cmake] Allow config.guess to be run with MSYS on Windows
Summary

With r363420, config.guess can no longer be run with MSYS on Windows and this
patch should be able to fix this particular case.

Diff Detail

Repository
rL LLVM

Event Timeline

pzheng created this revision.Jun 26 2019, 11:37 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 26 2019, 11:37 AM
Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript
pzheng added a reviewer: compnerd.Jun 26 2019, 11:38 AM
Harbormaster completed remote builds in B33962: Diff 206718.Jun 26 2019, 11:39 AM
compnerd accepted this revision.Jun 26 2019, 2:39 PM
This revision is now accepted and ready to land.Jun 26 2019, 2:39 PM
Closed by commit rL364485: [cmake] Allow config.guess to be run with MSYS on Windows (authored by pzheng). · Explain WhyJun 26 2019, 3:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
cmake/
modules/
2 lines

Diff 206754

llvm/trunk/cmake/modules/GetHostTriple.cmake

Show All 9 Lines if( MSVC )
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-windows-gnu" )
else() else()
set( value "i686-pc-windows-gnu" ) set( value "i686-pc-windows-gnu" )
endif() endif()
else( MSVC ) else( MSVC )
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows AND NOT MSYS)
message(WARNING "unable to determine host target triple") message(WARNING "unable to determine host target triple")
else() else()
set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)
execute_process(COMMAND sh ${config_guess} execute_process(COMMAND sh ${config_guess}
RESULT_VARIABLE TT_RV RESULT_VARIABLE TT_RV
OUTPUT_VARIABLE TT_OUT OUTPUT_VARIABLE TT_OUT
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if( NOT TT_RV EQUAL 0 ) if( NOT TT_RV EQUAL 0 )
message(FATAL_ERROR "Failed to execute ${config_guess}") message(FATAL_ERROR "Failed to execute ${config_guess}")
endif( NOT TT_RV EQUAL 0 ) endif( NOT TT_RV EQUAL 0 )
# Defer to dynamic detection of the host AIX version. # Defer to dynamic detection of the host AIX version.
string(REGEX REPLACE "-aix[0-9][^-]*" "-aix" value ${TT_OUT}) string(REGEX REPLACE "-aix[0-9][^-]*" "-aix" value ${TT_OUT})
endif() endif()
endif( MSVC ) endif( MSVC )
set( ${var} ${value} PARENT_SCOPE ) set( ${var} ${value} PARENT_SCOPE )
endfunction( get_host_triple var ) endfunction( get_host_triple var )