ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/tcg: isolate from QEMU's config-host.mak 

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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220419091020.3008144-19-alex.bennee@linaro.org>
This commit is contained in:
Paolo Bonzini 2022-04-19 10:10:13 +01:00 committed by Alex Bennée
parent eebf199c09
commit 544f4a2578
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -2937,7 +2937,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak
echo "NINJA=$ninja" >> $config_host_mak echo "NINJA=$ninja" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak echo "CC=$cc" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
echo "AR=$ar" >> $config_host_mak echo "AR=$ar" >> $config_host_mak
echo "AS=$as" >> $config_host_mak echo "AS=$as" >> $config_host_mak
echo "CCAS=$ccas" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak
@ -3057,7 +3056,7 @@ done
(for i in $cross_cc_vars; do (for i in $cross_cc_vars; do
export $i export $i
done 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) $source_path/tests/tcg/configure.sh)
# temporary config to build submodules # temporary config to build submodules

3
tests/tcg/Makefile.target
View File

@ -30,7 +30,7 @@
# #
all: all:
-include ../../../config-host.mak -include ../config-host.mak
-include ../config-$(TARGET).mak -include ../config-$(TARGET).mak
# Get semihosting definitions for user-mode emulation # 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 # Start with a blank slate, the build targets get to add stuff first
CFLAGS= CFLAGS=
QEMU_CFLAGS=
LDFLAGS= LDFLAGS=
QEMU_OPTS= QEMU_OPTS=

5
tests/tcg/configure.sh
View File

@ -83,6 +83,11 @@ fi
makefile=tests/tcg/Makefile.prereqs makefile=tests/tcg/Makefile.prereqs
echo "# Automatically generated by configure - do not modify" > $makefile 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= tcg_tests_targets=
for target in $target_list; do for target in $target_list; do
arch=${target%%-*} arch=${target%%-*}