Fiddling with the windows cross-compile gem logic.

Rakefile

@@ -240,7 +240,7 @@ task "gem:windows" => "gem" do
   raise "rbconfig #{rbconfig_20} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_20).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
 
   pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
-  sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
+  sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross2 native gem") || raise("build failed!")
 end
 
 # vim: syntax=Ruby

tasks/cross_compile.rb

@@ -121,12 +121,12 @@ def install
   end
 
   task :file_list do
-    HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
-    HOE.spec.files += Dir["lib/nokogiri/{1.9,2.0}/nokogiri.so"]
+    add_file_to_gem "lib/nokogiri/nokogiri.rb"
   end
+
 end
 
 require 'rake/clean'
 CLOBBER.include("#{CROSS_DIR}/*.installed", "#{CROSS_DIR}/#{HOST}", "tmp/#{HOST}")
 
-task :cross => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross:file_list"]
+task :cross2 => ["cross:libxslt", "lib/nokogiri/nokogiri.rb", "cross", "cross:file_list"]