[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 23/33] configure: move symlink configuration earlier
From: |
Alex Bennée |
Subject: |
[PATCH v1 23/33] configure: move symlink configuration earlier |
Date: |
Fri, 27 May 2022 16:35:53 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Ensure that the pc-bios/optionrom and pc-bios/s390-ccw directory
exist at the time when we'll write out the compiler configuration
for them.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-13-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index b8c21e096c..82c2ddc79a 100755
--- a/configure
+++ b/configure
@@ -2187,6 +2187,30 @@ fi
QEMU_GA_MSI_MINGW_BIN_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
+# Set up build tree symlinks that point back into the source tree
+# (these can be both files and directories).
+# Caution: avoid adding files or directories here using wildcards. This
+# will result in problems later if a new file matching the wildcard is
+# added to the source tree -- nothing will cause configure to be rerun
+# so the build tree will be missing the link back to the new file, and
+# tests might fail. Prefer to keep the relevant files in their own
+# directory and symlink the directory instead.
+LINKS="Makefile"
+LINKS="$LINKS tests/tcg/Makefile.target"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
+LINKS="$LINKS pc-bios/s390-ccw/Makefile"
+LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
+LINKS="$LINKS tests/avocado tests/data"
+LINKS="$LINKS tests/qemu-iotests/check"
+LINKS="$LINKS python"
+LINKS="$LINKS contrib/plugins/Makefile "
+for f in $LINKS ; do
+ if [ -e "$source_path/$f" ]; then
+ mkdir -p `dirname ./$f`
+ symlink "$source_path/$f" "$f"
+ fi
+done
+
# Mac OS X ships with a broken assembler
roms=
if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
@@ -2405,31 +2429,6 @@ if test "$safe_stack" = "yes"; then
echo "CONFIG_SAFESTACK=y" >> $config_host_mak
fi
-# If we're using a separate build tree, set it up now.
-# LINKS are things to symlink back into the source tree
-# (these can be both files and directories).
-# Caution: do not add files or directories here using wildcards. This
-# will result in problems later if a new file matching the wildcard is
-# added to the source tree -- nothing will cause configure to be rerun
-# so the build tree will be missing the link back to the new file, and
-# tests might fail. Prefer to keep the relevant files in their own
-# directory and symlink the directory instead.
-LINKS="Makefile"
-LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile"
-LINKS="$LINKS pc-bios/s390-ccw/Makefile"
-LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
-LINKS="$LINKS tests/avocado tests/data"
-LINKS="$LINKS tests/qemu-iotests/check"
-LINKS="$LINKS python"
-LINKS="$LINKS contrib/plugins/Makefile "
-for f in $LINKS ; do
- if [ -e "$source_path/$f" ]; then
- mkdir -p `dirname ./$f`
- symlink "$source_path/$f" "$f"
- fi
-done
-
# tests/tcg configuration
(makefile=tests/tcg/Makefile.prereqs
echo "# Automatically generated by configure - do not modify" > $makefile
--
2.30.2
- [PATCH v1 07/33] tests/docker: update debian-armel-cross with lcitool, (continued)
- [PATCH v1 07/33] tests/docker: update debian-armel-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 26/33] configure: enable cross compilation of vof, Alex Bennée, 2022/05/27
- [PATCH v1 18/33] tests/tcg: merge configure.sh back into main configure script, Alex Bennée, 2022/05/27
- [PATCH v1 17/33] tests/tcg: correct target CPU for sparc32, Alex Bennée, 2022/05/27
- [PATCH v1 29/33] gitlab: convert Cirrus jobs to .base_job_template, Alex Bennée, 2022/05/27
- [PATCH v1 15/33] build: do a full build before running TCG tests, Alex Bennée, 2022/05/27
- [PATCH v1 27/33] configure: remove unused variables from config-host.mak, Alex Bennée, 2022/05/27
- [PATCH v1 20/33] configure: handle host compiler in probe_target_compiler, Alex Bennée, 2022/05/27
- [PATCH v1 23/33] configure: move symlink configuration earlier,
Alex Bennée <=
- [PATCH v1 25/33] configure: enable cross-compilation of optionrom, Alex Bennée, 2022/05/27
- [PATCH v1 13/33] build: clean up ninja invocation, Alex Bennée, 2022/05/27
- [PATCH v1 11/33] tests/docker: update debian-amd64 with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 33/33] docs/devel: clean-up the CI links in the docs, Alex Bennée, 2022/05/27
- [PATCH v1 24/33] configure: enable cross-compilation of s390-ccw, Alex Bennée, 2022/05/27