HAYASHI Kentaro
null+****@clear*****
Thu Jan 29 00:09:38 JST 2015
HAYASHI Kentaro 2015-01-29 00:09:38 +0900 (Thu, 29 Jan 2015) New Revision: 87a778aca6a31a3d4aba4e741beef542f144f4fd https://github.com/groonga/groonga/commit/87a778aca6a31a3d4aba4e741beef542f144f4fd Message: packages windows: detect exception handling from actual dll Modified files: packages/windows/Rakefile Modified: packages/windows/Rakefile (+8 -1) =================================================================== --- packages/windows/Rakefile 2015-01-28 18:31:28 +0900 (ecec475) +++ packages/windows/Rakefile 2015-01-29 00:09:38 +0900 (9e58985) @@ -48,6 +48,9 @@ else mecab_patches << "mecab-0.98-mingw-w64.diff" end +use_seh_exception_p = + Pathname.new(`#{host}-g++ -print-file-name=libgcc_s_seh-1.dll`).exist? + def download(url, download_dir) base_name = url.split("/").last absolute_output_path = download_dir + base_name @@ -317,7 +320,11 @@ namespace :gcc do if groonga_win32_x86_p dlls << "libgcc_s_sjlj-1.dll" else - dlls << "libgcc_s_seh-1.dll" + if use_seh_exception_p + dlls << "libgcc_s_seh-1.dll" + else + dlls << "libgcc_s_sjlj-1.dll" + end end dlls.each do |dll| full_path = `#{host}-g++ -print-file-name=#{dll}`.strip -------------- next part -------------- HTML����������������������������...Download