[Groonga-commit] groonga/groonga at 8387e32 [master] package windows: bundle libgcc_s_seh-1.dll instead of libgcc_s_sjlj-1.dll for x64

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Aug 28 22:53:19 JST 2014


Kouhei Sutou	2014-08-28 22:53:19 +0900 (Thu, 28 Aug 2014)

  New Revision: 8387e32d4d2f1d93ecfe4040af06e5cbe62397b0
  https://github.com/groonga/groonga/commit/8387e32d4d2f1d93ecfe4040af06e5cbe62397b0

  Message:
    package windows: bundle libgcc_s_seh-1.dll instead of libgcc_s_sjlj-1.dll for x64

  Modified files:
    packages/windows/Rakefile

  Modified: packages/windows/Rakefile (+6 -1)
===================================================================
--- packages/windows/Rakefile    2014-08-28 22:41:07 +0900 (8c087ea)
+++ packages/windows/Rakefile    2014-08-28 22:53:19 +0900 (490f824)
@@ -223,7 +223,12 @@ namespace :gcc do
   namespace :dll do
     desc "Bundle GCC related DLLs"
     task(:bundle) do
-      dlls = ["libgcc_s_sjlj-1.dll", "libstdc++-6.dll", "libwinpthread-1.dll"]
+      dlls = ["libstdc++-6.dll", "libwinpthread-1.dll"]
+      if groonga_win32_x86_p
+        dlls << "libgcc_s_sjlj-1.dll"
+      else
+        dlls << "libgcc_s_seh-1.dll"
+      end
       dlls.each do |dll|
         full_path = `#{host}-g++ -print-file-name=#{dll}`.strip
         cp(full_path, (binary_dir + "bin").to_s)
-------------- next part --------------
HTML����������������������������...
Télécharger 



More information about the Groonga-commit mailing list
Back to archive index