Fix build error in cross-build with presym

Fix the following issues.

* https://github.com/mruby/mruby/pull/5220#issuecomment-757204258
* https://github.com/mruby/mruby/pull/5220#issuecomment-757205572
This commit is contained in:
KOBAYASHI Shuji
2021-01-10 10:21:45 +09:00
parent 6f6eabf05a
commit f80d5ece27
3 changed files with 9 additions and 7 deletions
+5 -5
View File
@@ -515,11 +515,7 @@ EOS
unless mrbcfile_external? || MRuby.targets['host']
# add minimal 'host'
MRuby::Build.new('host') do |conf|
if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
toolchain :visualcpp
else
toolchain :gcc
end
conf.toolchain
conf.build_mrbc_exec
conf.disable_libmruby
conf.disable_presym
@@ -527,6 +523,10 @@ EOS
end
end
def mrbcfile
mrbcfile_external? ? super : MRuby::targets['host'].mrbcfile
end
def run_test
@test_runner.runner_options << verbose_flag
mrbtest = exefile("#{build_dir}/bin/mrbtest")