diff options
| author | KOBAYASHI Shuji <[email protected]> | 2021-01-10 10:21:45 +0900 |
|---|---|---|
| committer | KOBAYASHI Shuji <[email protected]> | 2021-01-10 10:21:45 +0900 |
| commit | f80d5ece2786324fd7cf520a773cf51ba97ef83d (patch) | |
| tree | e3d49ba991f37c38470e5cd83e37afd811438e63 /lib | |
| parent | 6f6eabf05adbfd7b9041eac6c4678bc9851c13c6 (diff) | |
| download | mruby-f80d5ece2786324fd7cf520a773cf51ba97ef83d.tar.gz mruby-f80d5ece2786324fd7cf520a773cf51ba97ef83d.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mruby/build.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index ca2b28457..601c72b12 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -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") |