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

Fix build failure; ref #5194
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-11-27 08:57:03 +09:00
committed by GitHub
2 changed files with 6 additions and 6 deletions
+3 -1
View File
@@ -93,7 +93,9 @@ MRuby.each_target do |target|
end
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|
t.libraries
+3 -5
View File
@@ -41,11 +41,9 @@ macro_to_symbol = {
["" , "" ] => ["" , "" ],
}
core_cfiles = nil
core_rbfiles = nil
core_cfiles = Dir.glob("#{MRUBY_ROOT}/src/*.c")
core_rbfiles = Dir.glob("#{MRUBY_ROOT}/mrblib/*.rb")
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
rbfiles = core_rbfiles.dup
psfiles = []
@@ -58,8 +56,8 @@ MRuby.each_target do |build|
if gem.cdump?
rbfiles.concat(gem.rbfiles)
psfiles.concat(Dir.glob(gem.dir+"/**/presym"))
gem.compilers.each {|c| c.include_paths << "#{build.build_dir}/include"}
end
gem.compilers.each {|c| c.include_paths << "#{build.build_dir}/include"}
end
file presym_file => [*cfiles, *rbfiles, *psfiles, __FILE__] do