diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-05 19:32:45 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-05 19:32:45 +0900 |
| commit | 237feb7d39586df04188ebb5cada2b2e3c974969 (patch) | |
| tree | 1e20f3c781bf9668997e643609af34592a238500 | |
| parent | 4f3f22ec62f29f568a06cd4f244da9fead9fb8b3 (diff) | |
| parent | 0ad9b900a5ba8b6d81323b99bd185fdf3f2dcaa7 (diff) | |
| download | mruby-237feb7d39586df04188ebb5cada2b2e3c974969.tar.gz mruby-237feb7d39586df04188ebb5cada2b2e3c974969.zip | |
Merge pull request #2014 from kyab/fix_msvc_build_test
Fix 'make test' fail to build on Windows(MSVC)
| -rw-r--r-- | tasks/mrbgems_test.rake | 3 | ||||
| -rw-r--r-- | test/mrbtest.rake | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index b29a57f3d..bf775ffdd 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -115,7 +115,8 @@ MRuby.each_target do no_mrb_open_test_rbfiles << "#{MRUBY_ROOT}/test/no_mrb_open_test_dummy.rb" end - file "#{no_mrb_open_test}.o" => "#{no_mrb_open_test}.c" + no_mrb_open_test_lib = no_mrb_open_test.ext(exts.object) + file no_mrb_open_test_lib => "#{no_mrb_open_test}.c" file "#{no_mrb_open_test}.c" => no_mrb_open_test_rbfiles do |t| open(t.name, 'w') do |f| f.puts %Q[/*] diff --git a/test/mrbtest.rake b/test/mrbtest.rake index 1c52eafbd..e8eb6addd 100644 --- a/test/mrbtest.rake +++ b/test/mrbtest.rake @@ -16,7 +16,7 @@ MRuby.each_target do file mrbtest_lib => [mlib, ass_lib, gems.map(&:test_objs), gem_test_files].flatten do |t| archiver.run t.name, t.prerequisites end - file mrbtest_lib => "#{build_dir}/test/no_mrb_open_test.o" + file mrbtest_lib => "#{build_dir}/test/no_mrb_open_test.c".ext(exts.object) unless build_mrbtest_lib_only? driver_obj = objfile("#{current_build_dir}/driver") |