mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-16 00:12:51 +00:00
(svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier
This commit is contained in:
parent
501ee2105a
commit
bc199a4fe1
17
config.lib
17
config.lib
@ -1942,9 +1942,26 @@ check_compiler() {
|
|||||||
log 2 " exit code $ret"
|
log 2 " exit code $ret"
|
||||||
|
|
||||||
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
|
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
|
||||||
|
if [ -z "$5" ]; then
|
||||||
log 1 "checking $1... $compiler not found"
|
log 1 "checking $1... $compiler not found"
|
||||||
log 1 "I couldn't detect any $6 binary for $3"
|
log 1 "I couldn't detect any $6 binary for $3"
|
||||||
exit 1
|
exit 1
|
||||||
|
else
|
||||||
|
compiler="$3-$5"
|
||||||
|
fi
|
||||||
|
machine=`eval $compiler $9 2>/dev/null`
|
||||||
|
ret=$?
|
||||||
|
eval "$2=\"$compiler\""
|
||||||
|
|
||||||
|
log 2 "executing $compiler $9"
|
||||||
|
log 2 " returned $machine"
|
||||||
|
log 2 " exit code $ret"
|
||||||
|
|
||||||
|
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then
|
||||||
|
log 1 "checking $1... $compiler not found"
|
||||||
|
log 1 "I couldn't detect any $5 binary for $3"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
|
if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
|
||||||
|
Loading…
Reference in New Issue
Block a user