admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build failure; ref #5194

Browse Source 
Fix the following two issues:

1. Compile failure when external gem is specified.
   * https://github.com/mruby/mruby/pull/5194#issuecomment-734303442
2. When there are multiple build targets, presym parsing sometimes fails or
   output result of presym is broken.
   * https://github.com/mruby/mruby/pull/5194#issuecomment-734322142

The root cause of 2 is unknown, but it seems to occur when presym parsing is
performed in parallel, therefore I change them so that they are not run in
parallel.
This commit is contained in:
KOBAYASHI Shuji
2020-11-27 07:59:57 +09:00
parent 13fc503434
commit fdce0e712b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rakefile
+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
tasks/presym.rake
+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