mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
dearblue
000acedc35
Commitb9a1a1fb23is a revert of commit8df9a22a85, differing only in the comment. This means the issue from https://github.com/mruby/mruby/issues/6721 has reappeared. The cause of https://github.com/mruby/mruby/issues/6721, as stated in the commit message for commit8df9a22a85, is that each ".o" file has an indirect dependency on all ".pi" files through the presym file. This patch therefore adds a proxy-like task `gensym:update:#{build.name}` between tasks. Its purpose is to hide the direct dependency from ".o" files to the presym file from the rake system.
73 lines
2.6 KiB
Ruby
73 lines
2.6 KiB
Ruby
all_prerequisites = ->(task_name, prereqs) do
|
|
Rake::Task[task_name].prerequisites.each do |prereq_name|
|
|
next if prereqs[prereq_name]
|
|
prereqs[prereq_name] = true
|
|
all_prerequisites.(Rake::Task[prereq_name].name, prereqs)
|
|
end
|
|
end
|
|
|
|
MRuby.each_target do |build|
|
|
presym = build.presym
|
|
|
|
include_dir = "#{build.build_dir}/include"
|
|
build.compilers.each{|c| c.include_paths << include_dir}
|
|
build.gems.each{|gem| gem.compilers.each{|c| c.include_paths << include_dir}}
|
|
|
|
prereqs = {}
|
|
ppps = []
|
|
build_dir = "#{build.build_dir}/"
|
|
mrbc_build_dir = "#{build.mrbc_build.build_dir}/" if build.mrbc_build
|
|
build.products.each{|product| all_prerequisites.(product, prereqs)}
|
|
prereqs.each_key do |prereq|
|
|
next unless File.extname(prereq) == build.exts.object
|
|
next unless prereq.start_with?(build_dir)
|
|
next if mrbc_build_dir && prereq.start_with?(mrbc_build_dir)
|
|
ppp = prereq.ext(build.exts.presym_preprocessed)
|
|
if Rake.application.lookup(ppp) ||
|
|
Rake.application.enhance_with_matching_rule(ppp)
|
|
ppps << ppp
|
|
end
|
|
end
|
|
|
|
presym_task = file presym.list_path => ppps do
|
|
presyms = presym.scan(ppps)
|
|
current_presyms = presym.read_list if File.exist?(presym.list_path)
|
|
if presyms != current_presyms
|
|
mkdir_p presym.header_dir
|
|
%w[id table].each do |type|
|
|
presym.send("write_#{type}_header", presyms)
|
|
end
|
|
presym.write_list(presyms)
|
|
end
|
|
end
|
|
|
|
# Don't directly write dependency tasks in the "task" arguments.
|
|
# The rake system tracks dependencies recursively
|
|
# (see Rake::Task#all_prerequisite_tasks and #collect_prerequisites).
|
|
# Therefore, indirect dependencies from ".o" to ".pi" must be eliminated.
|
|
# ref. https://github.com/mruby/mruby/issues/6721
|
|
# This task acts a proxy-like for the "presym.list_path" task.
|
|
presym_proxy = task "gensym:update:#{build.name}" do
|
|
presym_task.invoke
|
|
end
|
|
|
|
# Override the "timestamp" method to reflect the presym file.
|
|
presym_proxy.define_singleton_method :timestamp do
|
|
presym_task.timestamp
|
|
end
|
|
|
|
# Ensure .o files depend on presym headers being generated.
|
|
# This is critical when a build's .o files are compiled during another
|
|
# build's presym scanning chain (before :gensym completes), e.g.:
|
|
# - internal sub-builds (mrbc) triggered by their parent build
|
|
# - the implicit host build triggered by a cross build needing mrbc
|
|
prereqs.each_key do |prereq|
|
|
next unless File.extname(prereq) == build.exts.object
|
|
next unless prereq.start_with?(build_dir)
|
|
next if mrbc_build_dir && prereq.start_with?(mrbc_build_dir)
|
|
file prereq => presym_proxy
|
|
end
|
|
|
|
task gensym: presym.list_path
|
|
end
|