From a47cc0eae75ac1ca365644e1af3d665e6c82a4e9 Mon Sep 17 00:00:00 2001 From: Evan Phoenix Date: Sun, 8 Jan 2012 17:53:15 -0800 Subject: [PATCH] Remove cross reporting workarounds since rack-compiler 0.8.0 fixes them --- Rakefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Rakefile b/Rakefile index 252a6f3e..4a09c648 100644 --- a/Rakefile +++ b/Rakefile @@ -62,7 +62,7 @@ Rake::ExtensionTask.new("puma_http11", HOE.spec) do |ext| # place extension inside namespace ext.lib_dir = "lib/puma" - ext.cross_compile = !!ENV['CROSS'] + ext.cross_compile = true ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32'] ext.cross_compiling do |spec| # add fat-binary stub only when cross compiling @@ -74,10 +74,8 @@ Rake::ExtensionTask.new("puma_http11", HOE.spec) do |ext| end # Java (JRuby) -if defined? JRUBY_VERSION - Rake::JavaExtensionTask.new("puma_http11", HOE.spec) do |ext| - ext.lib_dir = "lib/puma" - end +Rake::JavaExtensionTask.new("puma_http11", HOE.spec) do |ext| + ext.lib_dir = "lib/puma" end # the following is a fat-binary stub that will be used when