summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Rakefile7
-rw-r--r--tasks/mrbgems.rake2
2 files changed, 6 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index f522c808b..fd0336033 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,8 @@ load 'tasks/mruby_gem_spec.rake'
##############################
# compile flags
-load File.expand_path(ENV['CONFIG'] || './build_config.rb')
+MRUBY_CONFIG = File.expand_path(ENV['MRUBY_CONFIG'] || './build_config.rb')
+load MRUBY_CONFIG
load 'tasks/rules.rake'
load 'src/mruby_core.rake'
@@ -37,9 +38,9 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
install_path
end
-depfiles += MRuby.targets.reject {|n,t| n == 'host' }.map do |n, t|
+depfiles += MRuby.targets.reject {|n,t| n == 'host' }.map { |n, t|
["#{t.build_dir}/lib/libmruby.a"] + t.bins.map { |bin| exefile("#{t.build_dir}/bin/#{bin}") }
-end
+}.flatten
desc "build all targets, install (locally) in-repo"
task :all => depfiles
diff --git a/tasks/mrbgems.rake b/tasks/mrbgems.rake
index 356e40369..07e412b53 100644
--- a/tasks/mrbgems.rake
+++ b/tasks/mrbgems.rake
@@ -29,5 +29,7 @@ mrb_init_mrbgems(mrb_state *mrb) {
__EOF__
end
end
+
+ file "#{build_dir}/mrbgems/gem_init.c" => MRUBY_CONFIG
end
end