Setup.exe making on crosscompile.

git-svn-id: file:///svn/unbound/trunk@1727 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 3bc5c81dda29c35431fa4a73ceb2bc6e323dcfcd..ffe305b36cb3caa1af4e1254b7a6267e6dc01d7f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - dependencies for compat items, for crosscompile.
        - mingw32 crosscompile changes, dependencies and zipfile creation.
          and with System.dll from the windows NSIS you can make setup.exe.
+       - package libgcc_s_sjlj exception handler for NSISdl.dll.
 
 14 July 2009: Wouter
        - updated ldns tarball for solaris x64 compile assistance.

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 504503411eb334c59066746cd8ddf962b1790cee..fce2c2c9ccd6a2febdb41d765f2c021e1777c8e6 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -74,6 +74,10 @@ section "DLV - dlv.isc.org" SectionDLV
        # add estimated size for key (Kb)
        AddSize 2
        SetOutPath $INSTDIR
+
+       # libgcc exception lib used by NSISdl plugin (in crosscompile).
+       File /nonfatal "/oname=$PLUGINSDIR\libgcc_s_sjlj-1.dll" "/usr/i686-pc-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll"
+
        NSISdl::download "http://ftp.isc.org/www/dlv/dlv.isc.org.key" "$INSTDIR\dlv.isc.org.key"
        Pop $R0 # result from Inetc::get
        ${If} $R0 != "success"