diff --git a/lib/cibuildgem/tasks/wrapper.rake b/lib/cibuildgem/tasks/wrapper.rake index ea6a2d0..5effb7d 100644 --- a/lib/cibuildgem/tasks/wrapper.rake +++ b/lib/cibuildgem/tasks/wrapper.rake @@ -12,11 +12,9 @@ task "cibuildgem:setup" do end task "copy:stage:lib" do - version = RUBY_VERSION.match(/(\d\.\d)/)[1] - dest = File.join(task.extension_task.lib_dir, version) - src = File.join("tmp", task.extension_task.cross_platform, "stage", dest) + src = File.join("tmp", task.extension_task.cross_platform, "stage") - cp_r(src, dest, remove_destination: true) + cp_r(Dir.glob("#{src}/*"), ".", remove_destination: true) end unless Rake::Task.task_defined?(:test) diff --git a/test/fixtures/date/Rakefile b/test/fixtures/date/Rakefile index a68b370..68a1844 100644 --- a/test/fixtures/date/Rakefile +++ b/test/fixtures/date/Rakefile @@ -8,7 +8,7 @@ CLEAN.include("**/*.o", "**/*.so", "**/*.bundle", "*.jar", "pkg", "tmp") extask = Rake::ExtensionTask.new("date") do |ext| ext.name = "date_core" - ext.lib_dir.sub!(%r[(?=/|\z)], "/#{RUBY_VERSION}/#{ext.platform}") + ext.lib_dir.sub!(%r[(?=/|\z)], "/#{ext.platform}") end Rake::TestTask.new(:test) do |t|