summaryrefslogtreecommitdiffhomepage
path: root/tasks/mrbgems.rake
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-01-30 07:33:35 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-01-30 07:33:35 +0900
commit24679c6dd64a09a18d9576b4d87a11b3fd223268 (patch)
tree40d0bbd0fe65191b90a4f8b021d012bb2f5643a7 /tasks/mrbgems.rake
parent78b362f8dd1713895596a241a35be4299d4f84a8 (diff)
parent6440f108bde035ec4c738f261062fe281b77053e (diff)
downloadmruby-24679c6dd64a09a18d9576b4d87a11b3fd223268.tar.gz
mruby-24679c6dd64a09a18d9576b4d87a11b3fd223268.zip
resolve conflict
Diffstat (limited to 'tasks/mrbgems.rake')
-rw-r--r--tasks/mrbgems.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/tasks/mrbgems.rake b/tasks/mrbgems.rake
index 9d8798ef3..285aa75b8 100644
--- a/tasks/mrbgems.rake
+++ b/tasks/mrbgems.rake
@@ -8,7 +8,7 @@ MRuby.each_target do
# loader all gems
self.libmruby << objfile("#{build_dir}/mrbgems/gem_init")
file objfile("#{build_dir}/mrbgems/gem_init") => "#{build_dir}/mrbgems/gem_init.c"
- file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG] do |t|
+ file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIGS].flatten do |t|
FileUtils.mkdir_p "#{build_dir}/mrbgems"
open(t.name, 'w') do |f|
f.puts %Q[/*]