Commit af624a0a authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #716 from carsonmcdonald/crossdepfix

Make conf.bins work for cross compiled deps as well as the host.
parents 270f261f de33b1e1
......@@ -27,18 +27,22 @@ load 'test/mrbtest.rake'
# generic build targets, rules
task :default => :all
binfiles = MRuby.targets['host'].bins.map do |bin|
depfiles = MRuby.targets['host'].bins.map do |bin|
install_path = exefile("bin/#{bin}")
file install_path => exefile("build/host/bin/#{bin}") do |t|
FileUtils.cp t.prerequisites.first, t.name
end
install_path
end
depfiles += MRuby.targets.reject {|n,t| n == 'host' }.map do |n, t|
["#{t.build_dir}/lib/libmruby.a"] + t.bins.map { |bin| exefile("#{t.build_dir}/bin/#{bin}") }
end
desc "build all targets, install (locally) in-repo"
task :all => binfiles + MRuby.targets.values.map { |t| [exefile("#{t.build_dir}/bin/mruby"), exefile("#{t.build_dir}/bin/mirb"), exefile("#{t.build_dir}/bin/mrbc")] }.flatten
task :all => depfiles
desc "run all mruby tests"
task :test => MRuby.targets.values.map { |t| exefile("#{t.build_dir}/test/mrbtest") } do
......@@ -53,5 +57,5 @@ task :clean do
MRuby.each_target do |t|
FileUtils.rm_rf t.build_dir
end
FileUtils.rm_f binfiles
FileUtils.rm_f depfiles
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment