[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 07/12] configure: move symlink configuration earlier
From: |
Paolo Bonzini |
Subject: |
[RFC PATCH 07/12] configure: move symlink configuration earlier |
Date: |
Fri, 29 Apr 2022 16:18:08 +0200 |
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.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index bdb0cc35a8..de2bc799cd 100755
--- a/configure
+++ b/configure
@@ -2210,6 +2210,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"; } && \
@@ -2431,31 +2455,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.35.1
- Re: [RFC PATCH 12/12] configure: enable cross compilation of vof, (continued)
- [RFC PATCH 02/12] configure: add missing cross compiler fallbacks, Paolo Bonzini, 2022/04/29
- [RFC PATCH 01/12] tests/tcg: merge configure.sh back into main configure script, Paolo Bonzini, 2022/04/29
- [RFC PATCH 04/12] configure: introduce --cross-prefix-*=, Paolo Bonzini, 2022/04/29
- [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson, Paolo Bonzini, 2022/04/29
- [RFC PATCH 05/12] configure: include more binutils in tests/tcg makefile, Paolo Bonzini, 2022/04/29
- [RFC PATCH 07/12] configure: move symlink configuration earlier,
Paolo Bonzini <=
- [RFC PATCH 09/12] pc-bios/optionrom: detect -fno-pie, Paolo Bonzini, 2022/04/29
- [RFC PATCH 08/12] configure: enable cross-compilation of s390-ccw, Paolo Bonzini, 2022/04/29
- [RFC PATCH 11/12] configure: enable cross-compilation of optionrom, Paolo Bonzini, 2022/04/29