configure: handle host compiler in probe_target_compiler
In preparation for handling more binaries than just cc, handle the case of "probe_target_compiler $cpu" directly in the function, setting the target_* variables based on the ones that are used to build QEMU. The clang check also needs to be moved after this fallback. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220517092616.1272238-10-pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220527153603.887929-21-alex.bennee@linaro.org>
This commit is contained in:
parent
46af66edcb
commit
2ad60f6f8c
|
@ -954,10 +954,6 @@ case $git_submodules_action in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if eval test -z "\${cross_cc_$cpu}"; then
|
|
||||||
eval "cross_cc_${cpu}=\$cc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
default_target_list=""
|
default_target_list=""
|
||||||
mak_wilds=""
|
mak_wilds=""
|
||||||
|
|
||||||
|
@ -2008,13 +2004,6 @@ probe_target_compiler() {
|
||||||
if eval test -n "\"\${cross_cc_$1}\""; then
|
if eval test -n "\"\${cross_cc_$1}\""; then
|
||||||
if eval has "\"\${cross_cc_$1}\""; then
|
if eval has "\"\${cross_cc_$1}\""; then
|
||||||
eval "target_cc=\"\${cross_cc_$1}\""
|
eval "target_cc=\"\${cross_cc_$1}\""
|
||||||
case $1 in
|
|
||||||
i386|x86_64)
|
|
||||||
if $target_cc --version | grep -qi "clang"; then
|
|
||||||
unset target_cc
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if eval test -n "\"\${cross_as_$1}\""; then
|
if eval test -n "\"\${cross_as_$1}\""; then
|
||||||
|
@ -2027,6 +2016,20 @@ probe_target_compiler() {
|
||||||
eval "target_ld=\"\${cross_ld_$1}\""
|
eval "target_ld=\"\${cross_ld_$1}\""
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if test "$1" = $cpu; then
|
||||||
|
: ${target_cc:=$cc}
|
||||||
|
: ${target_as:=$as}
|
||||||
|
: ${target_ld:=$ld}
|
||||||
|
fi
|
||||||
|
if test -n "$target_cc"; then
|
||||||
|
case $1 in
|
||||||
|
i386|x86_64)
|
||||||
|
if $target_cc --version | grep -qi "clang"; then
|
||||||
|
unset target_cc
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
write_target_makefile() {
|
write_target_makefile() {
|
||||||
|
|
Loading…
Reference in New Issue