summaryrefslogtreecommitdiffhomepage
path: root/tasks
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2021-01-10 22:15:52 +0900
committerGitHub <[email protected]>2021-01-10 22:15:52 +0900
commit80a7655b10d3716b8ab8f02d4b843c4935c1c809 (patch)
treea97e67df121208a960c26a798e5deff6188d4f48 /tasks
parentdc5ade37295747615d881c545a1eb4173dea9684 (diff)
parentf80d5ece2786324fd7cf520a773cf51ba97ef83d (diff)
downloadmruby-80a7655b10d3716b8ab8f02d4b843c4935c1c809.tar.gz
mruby-80a7655b10d3716b8ab8f02d4b843c4935c1c809.zip
Merge pull request #5271 from shuujii/fix-build-error-in-cross-build-with-presym
Fix build error in cross-build with presym
Diffstat (limited to 'tasks')
-rw-r--r--tasks/presym.rake4
1 files changed, 3 insertions, 1 deletions
diff --git a/tasks/presym.rake b/tasks/presym.rake
index f3a076ac6..38d36c9e2 100644
--- a/tasks/presym.rake
+++ b/tasks/presym.rake
@@ -1,3 +1,4 @@
+mrbtest = "#{MRuby::Build.install_dir}/mrbtest"
all_prerequisites = ->(task_name, prereqs) do
Rake::Task[task_name].prerequisites.each do |prereq_name|
next if prereqs[prereq_name]
@@ -18,13 +19,14 @@ MRuby.each_target do |build|
prereqs = {}
pps = []
- mrbtest = "#{build.class.install_dir}/mrbtest"
+ build_dir = "#{build.build_dir}/"
mrbc_build_dir = "#{build.mrbc_build.build_dir}/" if build.mrbc_build
build.products.each do |product|
all_prerequisites.(product, prereqs) unless product == mrbtest
end
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)
pps << prereq.ext(build.exts.preprocessed)
end