qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v1 23/33] configure: move symlink configuration earlier


From: Paolo Bonzini
Subject: Re: [PATCH v1 23/33] configure: move symlink configuration earlier
Date: Mon, 30 May 2022 10:31:47 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0

On 5/27/22 17:35, Alex Bennée wrote:
  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

This now conflicts with master due to the QEMU_GA_MSI_MINGW_BIN_PATH being gone. Fixing the conflict is just a matter of removing the line from the "======"....">>>>>>" section.

Paolo



reply via email to

[Prev in Thread] Current Thread [Next in Thread]