[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 18/25] tests/tcg: isolate from QEMU's config-host.mak
From: |
Alex Bennée |
Subject: |
[PATCH v1 18/25] tests/tcg: isolate from QEMU's config-host.mak |
Date: |
Tue, 19 Apr 2022 10:10:13 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Do not include variables for the QEMU's own compiler, as they
are not necessarily related to the cross compiler used for tests/tcg.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220401141326.1244422-16-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 3 +--
tests/tcg/Makefile.target | 3 +--
tests/tcg/configure.sh | 5 +++++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 7c08c18358..e8786d478e 100755
--- a/configure
+++ b/configure
@@ -2937,7 +2937,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak
echo "NINJA=$ninja" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
-echo "HOST_CC=$host_cc" >> $config_host_mak
echo "AR=$ar" >> $config_host_mak
echo "AS=$as" >> $config_host_mak
echo "CCAS=$ccas" >> $config_host_mak
@@ -3057,7 +3056,7 @@ done
(for i in $cross_cc_vars; do
export $i
done
-export target_list source_path use_containers cpu
+export target_list source_path use_containers cpu host_cc
$source_path/tests/tcg/configure.sh)
# temporary config to build submodules
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index 95499d8c9b..f427a0304e 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -30,7 +30,7 @@
#
all:
--include ../../../config-host.mak
+-include ../config-host.mak
-include ../config-$(TARGET).mak
# Get semihosting definitions for user-mode emulation
@@ -77,7 +77,6 @@ EXTRA_TESTS=
# Start with a blank slate, the build targets get to add stuff first
CFLAGS=
-QEMU_CFLAGS=
LDFLAGS=
QEMU_OPTS=
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index a577dd7ece..75603fee6d 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -83,6 +83,11 @@ fi
makefile=tests/tcg/Makefile.prereqs
echo "# Automatically generated by configure - do not modify" > $makefile
+config_host_mak=tests/tcg/config-host.mak
+echo "# Automatically generated by configure - do not modify" >
$config_host_mak
+echo "SRC_PATH=$source_path" >> $config_host_mak
+echo "HOST_CC=$host_cc" >> $config_host_mak
+
tcg_tests_targets=
for target in $target_list; do
arch=${target%%-*}
--
2.30.2
- [PATCH v1 11/25] tests/docker: do not duplicate rules for hexagon-cross, (continued)
- [PATCH v1 11/25] tests/docker: do not duplicate rules for hexagon-cross, Alex Bennée, 2022/04/19
- [PATCH v1 09/25] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES), Alex Bennée, 2022/04/19
- [PATCH v1 14/25] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak, Alex Bennée, 2022/04/19
- [PATCH v1 12/25] tests/tcg: add compiler test variables when using containers, Alex Bennée, 2022/04/19
- [PATCH v1 08/25] tests/docker: inline variable definitions or move close to use, Alex Bennée, 2022/04/19
- [PATCH v1 18/25] tests/tcg: isolate from QEMU's config-host.mak,
Alex Bennée <=
- [PATCH v1 20/25] tests/tcg: fix non-static build, Alex Bennée, 2022/04/19
- [PATCH v1 16/25] tests/tcg: list test targets in Makefile.prereqs, Alex Bennée, 2022/04/19
- [PATCH v1 19/25] tests/docker: remove SKIP_DOCKER_BUILD, Alex Bennée, 2022/04/19
- [PATCH v1 15/25] tests/tcg: prepare Makefile.prereqs at configure time, Alex Bennée, 2022/04/19
- [PATCH v1 17/25] tests/tcg: invoke Makefile.target directly from QEMU's makefile, Alex Bennée, 2022/04/19