Unverified Commit 60598342 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub

Merge pull request #5196 from shuujii/fix-build-failure

Fix build failure; ref #5194
parents 13fc5034 fdce0e71
...@@ -93,7 +93,9 @@ MRuby.each_target do |target| ...@@ -93,7 +93,9 @@ MRuby.each_target do |target|
end end
desc "preallocated symbols" desc "preallocated symbols"
task :gensym => MRuby.targets.values.map(&:presym_file) task :gensym do
MRuby.each_target{|build| Rake::Task[build.presym_file].invoke}
end
depfiles += MRuby.targets.map { |n, t| depfiles += MRuby.targets.map { |n, t|
t.libraries t.libraries
......
...@@ -41,11 +41,9 @@ macro_to_symbol = { ...@@ -41,11 +41,9 @@ macro_to_symbol = {
["" , "" ] => ["" , "" ], ["" , "" ] => ["" , "" ],
} }
core_cfiles = nil core_cfiles = Dir.glob("#{MRUBY_ROOT}/src/*.c")
core_rbfiles = nil core_rbfiles = Dir.glob("#{MRUBY_ROOT}/mrblib/*.rb")
MRuby.each_target do |build| MRuby.each_target do |build|
core_cfiles ||= Dir.glob("#{MRUBY_ROOT}/src/*.c")
core_rbfiles ||= Dir.glob("#{MRUBY_ROOT}/mrblib/*.rb")
cfiles = core_cfiles.dup cfiles = core_cfiles.dup
rbfiles = core_rbfiles.dup rbfiles = core_rbfiles.dup
psfiles = [] psfiles = []
...@@ -58,8 +56,8 @@ MRuby.each_target do |build| ...@@ -58,8 +56,8 @@ MRuby.each_target do |build|
if gem.cdump? if gem.cdump?
rbfiles.concat(gem.rbfiles) rbfiles.concat(gem.rbfiles)
psfiles.concat(Dir.glob(gem.dir+"/**/presym")) psfiles.concat(Dir.glob(gem.dir+"/**/presym"))
gem.compilers.each {|c| c.include_paths << "#{build.build_dir}/include"}
end end
gem.compilers.each {|c| c.include_paths << "#{build.build_dir}/include"}
end end
file presym_file => [*cfiles, *rbfiles, *psfiles, __FILE__] do file presym_file => [*cfiles, *rbfiles, *psfiles, __FILE__] do
......
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