diff options
| author | Paolo Bonzini | 2022-05-27 17:35:50 +0200 |
|---|---|---|
| committer | Alex Bennée | 2022-06-01 16:47:43 +0200 |
| commit | 2ad60f6f8c12ca0acd8834fdd70e088361b8791f (patch) | |
| tree | 780e6ba83e3550eb8d457d0e4cc2e39d99bcf42e /configure | |
| parent | configure: add missing cross compiler fallbacks (diff) | |
| download | qemu-2ad60f6f8c12ca0acd8834fdd70e088361b8791f.tar.gz qemu-2ad60f6f8c12ca0acd8834fdd70e088361b8791f.tar.xz qemu-2ad60f6f8c12ca0acd8834fdd70e088361b8791f.zip | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -954,10 +954,6 @@ case $git_submodules_action in ;; esac -if eval test -z "\${cross_cc_$cpu}"; then - eval "cross_cc_${cpu}=\$cc" -fi - default_target_list="" mak_wilds="" @@ -2008,13 +2004,6 @@ probe_target_compiler() { if eval test -n "\"\${cross_cc_$1}\""; then if eval has "\"\${cross_cc_$1}\""; then 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 if eval test -n "\"\${cross_as_$1}\""; then @@ -2027,6 +2016,20 @@ probe_target_compiler() { eval "target_ld=\"\${cross_ld_$1}\"" 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() { |