diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-01-10 22:15:52 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-10 22:15:52 +0900 |
| commit | 80a7655b10d3716b8ab8f02d4b843c4935c1c809 (patch) | |
| tree | a97e67df121208a960c26a798e5deff6188d4f48 /lib | |
| parent | dc5ade37295747615d881c545a1eb4173dea9684 (diff) | |
| parent | f80d5ece2786324fd7cf520a773cf51ba97ef83d (diff) | |
| download | mruby-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 '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") |