[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/20] configure: unify creation of cross-compilation Makefiles
From: |
Paolo Bonzini |
Subject: |
[PATCH 15/20] configure: unify creation of cross-compilation Makefiles |
Date: |
Fri, 26 Aug 2022 00:27:40 +0200 |
Let write_target_makefile handle both host and container cross compilers.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 94 +++++++++++++++++++++++++------------------------------
1 file changed, 43 insertions(+), 51 deletions(-)
diff --git a/configure b/configure
index 6dc6a5a48b..37ddd90bb1 100755
--- a/configure
+++ b/configure
@@ -2191,51 +2191,49 @@ probe_target_compiler() {
write_target_makefile() {
echo "EXTRA_CFLAGS=$target_cflags"
- if test -n "$target_cc"; then
- echo "CC=$target_cc"
- echo "CCAS=$target_ccas"
- fi
- if test -n "$target_ar"; then
- echo "AR=$target_ar"
- fi
- if test -n "$target_as"; then
- echo "AS=$target_as"
- fi
- if test -n "$target_ld"; then
- echo "LD=$target_ld"
- fi
- if test -n "$target_nm"; then
- echo "NM=$target_nm"
- fi
- if test -n "$target_objcopy"; then
- echo "OBJCOPY=$target_objcopy"
- fi
- if test -n "$target_ranlib"; then
- echo "RANLIB=$target_ranlib"
- fi
- if test -n "$target_strip"; then
- echo "STRIP=$target_strip"
+ if test -z "$target_cc" && test -z "$target_as"; then
+ test -z "$container_image" && error_exit "Internal error: could not find
cross compiler for $1?"
+ echo "$1: docker-image-$container_image" >> Makefile.prereqs
+ if test -n "$container_cross_cc"; then
+ echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image
-s $source_path --"
+ echo "CCAS=$docker_py cc --cc $container_cross_cc -i
qemu/$container_image -s $source_path --"
+ fi
+ echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image
-s $source_path --"
+ echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image
-s $source_path --"
+ echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image
-s $source_path --"
+ echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image
-s $source_path --"
+ echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i
qemu/$container_image -s $source_path --"
+ echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i
qemu/$container_image -s $source_path --"
+ echo "STRIP=$docker_py cc --cc $container_cross_strip -i
qemu/$container_image -s $source_path --"
+ else
+ if test -n "$target_cc"; then
+ echo "CC=$target_cc"
+ echo "CCAS=$target_ccas"
+ fi
+ if test -n "$target_ar"; then
+ echo "AR=$target_ar"
+ fi
+ if test -n "$target_as"; then
+ echo "AS=$target_as"
+ fi
+ if test -n "$target_ld"; then
+ echo "LD=$target_ld"
+ fi
+ if test -n "$target_nm"; then
+ echo "NM=$target_nm"
+ fi
+ if test -n "$target_objcopy"; then
+ echo "OBJCOPY=$target_objcopy"
+ fi
+ if test -n "$target_ranlib"; then
+ echo "RANLIB=$target_ranlib"
+ fi
+ if test -n "$target_strip"; then
+ echo "STRIP=$target_strip"
+ fi
fi
}
-write_container_target_makefile() {
- echo "$1: docker-image-$container_image" >> Makefile.prereqs
- echo "EXTRA_CFLAGS=$target_cflags"
- if test -n "$container_cross_cc"; then
- echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image
-s $source_path --"
- echo "CCAS=$docker_py cc --cc $container_cross_cc -i qemu/$container_image
-s $source_path --"
- fi
- echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image -s
$source_path --"
- echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image -s
$source_path --"
- echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image -s
$source_path --"
- echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image -s
$source_path --"
- echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i
qemu/$container_image -s $source_path --"
- echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i
qemu/$container_image -s $source_path --"
- echo "STRIP=$docker_py cc --cc $container_cross_strip -i
qemu/$container_image -s $source_path --"
-}
-
-
-
##########################################
# check for vfio_user_server
@@ -2587,15 +2585,9 @@ for target in $target_list; do
;;
esac
- probe_target_compiler $target
- if test $got_cross_cc = yes; then
- write_target_makefile >> $config_target_mak
- elif test -n "$container_image"; then
- build_static=y
- write_container_target_makefile build-tcg-tests-$target >>
$config_target_mak
- got_cross_cc=yes
- fi
- if test $got_cross_cc = yes; then
+ if probe_target_compiler $target || test -n "$container_image"; then
+ test -n "$container_image" && build_static=y
+ write_target_makefile build-tcg-tests-$target >> $config_target_mak
mkdir -p tests/tcg/$target
ln -sf $source_path/tests/tcg/Makefile.target tests/tcg/$target/Makefile
ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak
--
2.37.1
- [PATCH 06/20] configure: return status code from probe_target_compiler, (continued)
- [PATCH 06/20] configure: return status code from probe_target_compiler, Paolo Bonzini, 2022/08/25
- [PATCH 04/20] vof: add distclean target, Paolo Bonzini, 2022/08/25
- [PATCH 07/20] configure: store container engine in config-host.mak, Paolo Bonzini, 2022/08/25
- [PATCH 08/20] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/08/25
- [PATCH 09/20] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/08/25
- [PATCH 10/20] tests/tcg: add distclean rule, Paolo Bonzini, 2022/08/25
- [PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 12/20] tests/tcg: clean up calls to run-test, Paolo Bonzini, 2022/08/25
- [PATCH 13/20] tests/tcg: move compiler tests to Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/08/25
- [PATCH 15/20] configure: unify creation of cross-compilation Makefiles,
Paolo Bonzini <=
- [PATCH 17/20] configure: build ROMs with container-based cross compilers, Paolo Bonzini, 2022/08/25
- [PATCH 18/20] pc-bios/optionrom: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 16/20] configure: cleanup creation of tests/tcg target config, Paolo Bonzini, 2022/08/25
- [PATCH 19/20] pc-bios/s390-ccw: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 20/20] pc-bios/vof: Adopt meson style Make output, Paolo Bonzini, 2022/08/25