[msitools: 2/13] wxi: fedora switched gcc to dwarf-2 exceptions



commit d4970f7dd9f72138c3014169601546d86f9e5c7b
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Tue Nov 12 11:38:14 2019 +0400

    wxi: fedora switched gcc to dwarf-2 exceptions

 data/wixl/gcc.wxi    | 2 +-
 data/wxi-validate.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/wixl/gcc.wxi b/data/wixl/gcc.wxi
index 6ee03c3..452a65e 100644
--- a/data/wixl/gcc.wxi
+++ b/data/wixl/gcc.wxi
@@ -13,7 +13,7 @@
 <?if $(var.Win64) = "yes"?>
           <File Id="fil246F7D773B308C471E32C8FB3BE85730" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libgcc_s_seh-1.dll"/>
 <?else?>
-          <File Id="filDC11F2B0D7B6BE3CCA2B5003E81CC8F1" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libgcc_s_sjlj-1.dll"/>
+          <File Id="filDC11F2B0D7B6BE3CCA2B5003E81CC8F1" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libgcc_s_dw2-1.dll"/>
 <?endif?>
         </Component>
         <Component Win64="$(var.Win64)" Id="cmp94EF633C9D64EF2F94885691030F7EB7" Guid="*">
diff --git a/data/wxi-validate.pl b/data/wxi-validate.pl
index bc2221b..1ec9bde 100755
--- a/data/wxi-validate.pl
+++ b/data/wxi-validate.pl
@@ -211,7 +211,7 @@ sub load {
 
             # gcc
             $msifile32 = undef if $msifile32 =~ /libgcc_s_seh-1\.dll/;
-            $msifile64 = undef if $msifile64 =~ /libgcc_s_sjlj-1.dll/;
+            $msifile64 = undef if $msifile64 =~ /libgcc_s_dw2-1.dll/;
 
             # openssl
             $msifile32 = undef if $msifile32 && $msifile32 =~ /lib(ssl|crypto)-[^-]+-x64.dll/;


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