[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/16] configure: handle host compiler in probe_target_compiler
From: |
Paolo Bonzini |
Subject: |
[PATCH 09/16] configure: handle host compiler in probe_target_compiler |
Date: |
Tue, 17 May 2022 11:26:09 +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 1d9d60185c..016df3fa6e 100755
--- a/configure
+++ b/configure
@@ -964,10 +964,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=""
@@ -2021,13 +2017,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
@@ -2040,6 +2029,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.36.0
- [PATCH 02/16] build: clean up ninja invocation, (continued)
- [PATCH 02/16] build: clean up ninja invocation, Paolo Bonzini, 2022/05/17
- [PATCH 03/16] build: add a more generic way to specify make->ninja dependencies, Paolo Bonzini, 2022/05/17
- [PATCH 04/16] build: do a full build before running TCG tests, Paolo Bonzini, 2022/05/17
- [PATCH 06/16] tests/tcg: correct target CPU for sparc32, Paolo Bonzini, 2022/05/17
- [PATCH 05/16] configure, meson: move symlinking of ROMs to meson, Paolo Bonzini, 2022/05/17
- [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script, Paolo Bonzini, 2022/05/17
- [PATCH 09/16] configure: handle host compiler in probe_target_compiler,
Paolo Bonzini <=
- [PATCH 10/16] configure: introduce --cross-prefix-*=, Paolo Bonzini, 2022/05/17
- [PATCH 11/16] configure: include more binutils in tests/tcg makefile, Paolo Bonzini, 2022/05/17
- [PATCH 08/16] configure: add missing cross compiler fallbacks, Paolo Bonzini, 2022/05/17
- [PATCH 12/16] configure: move symlink configuration earlier, Paolo Bonzini, 2022/05/17
- [PATCH 14/16] configure: enable cross-compilation of optionrom, Paolo Bonzini, 2022/05/17
- [PATCH 16/16] configure: remove unused variables from config-host.mak, Paolo Bonzini, 2022/05/17
- [PATCH 13/16] configure: enable cross-compilation of s390-ccw, Paolo Bonzini, 2022/05/17
- [PATCH 15/16] configure: enable cross compilation of vof, Paolo Bonzini, 2022/05/17