qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <michael.roth@amd.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: [PULL for-6.1 5/6] qemu-ga/msi: fix w32 libgcc name
Date: Tue,  3 Aug 2021 08:24:51 -0500	[thread overview]
Message-ID: <20210803132450.1093602-6-michael.roth@amd.com> (raw)
In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com>

From: Gerd Hoffmann <kraxel@redhat.com>

This is what I find on my Fedora 34 mingw install.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>
---
 qga/installer/qemu-ga.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 9cb4c3d733..ce7b25b5e1 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -31,7 +31,7 @@
   <?endif?>
 
   <?if $(var.Arch) = "32"?>
-    <?define ArchLib=libgcc_s_sjlj-1.dll?>
+    <?define ArchLib=libgcc_s_dw2-1.dll?>
     <?define GaProgramFilesFolder="ProgramFilesFolder" ?>
   <?endif?>
 
-- 
2.25.1



  parent reply	other threads:[~2021-08-03 13:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03 13:24 [PULL for-6.1 0/6] qemu-ga patch queue for hard-freeze Michael Roth
2021-08-03 13:24 ` [PULL for-6.1 1/6] qga-win: Increase VSS freeze timeout to 60 secs instead of 10 Michael Roth
2021-08-03 13:24 ` [PULL for-6.1 2/6] qga-win: Fix build_guest_fsinfo() close of nonexistent Michael Roth
2021-08-03 13:24 ` [PULL for-6.1 3/6] qga-win: Fix handle leak in ga_get_win_product_name() Michael Roth
2021-08-03 13:24 ` [PULL for-6.1 4/6] qga-win: Free GMatchInfo properly Michael Roth
2021-08-03 13:24 ` Michael Roth [this message]
2021-08-03 13:24 ` [PULL for-6.1 6/6] qga-win/msi: fix missing libstdc++-6 DLL in MSI installer Michael Roth
2021-08-03 16:49 ` [PULL for-6.1 0/6] qemu-ga patch queue for hard-freeze Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210803132450.1093602-6-michael.roth@amd.com \
    --to=michael.roth@amd.com \
    --cc=kraxel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).