summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortduehr <td@matasano.com>2014-07-01 12:54:16 -0500
committertduehr <td@matasano.com>2014-07-01 12:54:16 -0500
commite68b5ad692d5d79bbe0026d80aa71561ae667d15 (patch)
tree048c70ceb268d6ba29abb98aba7934e8238b46c4
parent85accd34a4310bf53eaa477291d9c9618c6c1fc9 (diff)
parent6a4c68edce52896ff06b9d24359bb2dbe9bdc955 (diff)
downloadffi-e68b5ad692d5d79bbe0026d80aa71561ae667d15.tar.gz
Merge pull request #298 from larskanis/mingw-support
Bump rake-compilers version to 0.9.2 to ensure x64-mingw32 is built correctly.
-rw-r--r--Rakefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/Rakefile b/Rakefile
index 421f4d6..3f05f18 100644
--- a/Rakefile
+++ b/Rakefile
@@ -192,17 +192,11 @@ if USE_RAKE_COMPILER
ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
task "copy:ffi_c:i386-mingw32:#{ruby_version}" do |t|
- %w[lib #{BUILD_DIR}/i386-mingw32/stage/lib].each do |dir|
- if File.exists?("#{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
- sh "i686-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
- end
- end
+ sh "i686-w64-mingw32-strip -S #{BUILD_DIR}/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
end
task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
- if File.exists?("#{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
- sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
- end
+ sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
end
end
end