[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 03/12] configure: handle host compiler in probe_target_compil
From: |
Paolo Bonzini |
Subject: |
[RFC PATCH 03/12] configure: handle host compiler in probe_target_compiler |
Date: |
Fri, 29 Apr 2022 16:18:04 +0200 |
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>
---
configure | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index a208459ff1..5277ac9092 100755
--- a/configure
+++ b/configure
@@ -965,10 +965,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=""
@@ -2026,13 +2022,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
@@ -2045,6 +2034,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() {
--
2.35.1
- [RFC PATCH 00/12] Cross compilation of embedded firmware, Paolo Bonzini, 2022/04/29
- [RFC PATCH 03/12] configure: handle host compiler in probe_target_compiler,
Paolo Bonzini <=
- [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds, Paolo Bonzini, 2022/04/29
- [RFC PATCH 12/12] configure: enable cross compilation of vof, Paolo Bonzini, 2022/04/29
- [RFC PATCH 02/12] configure: add missing cross compiler fallbacks, Paolo Bonzini, 2022/04/29
- [RFC PATCH 01/12] tests/tcg: merge configure.sh back into main configure script, Paolo Bonzini, 2022/04/29
- [RFC PATCH 04/12] configure: introduce --cross-prefix-*=, Paolo Bonzini, 2022/04/29
- [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson, Paolo Bonzini, 2022/04/29