diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-02-07 02:10:23 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-02-07 02:10:23 -0800 |
| commit | d3c77559754a196476d1c9a5bdd30a8559affe30 (patch) | |
| tree | 7399784fe9bbe709baf122993526e40f5b5f3f48 | |
| parent | ab2431ed1d63195d8acc61c3f60b076af0001f42 (diff) | |
| parent | 42b7fe62d8c1e0470431469c9ffcf6cad819a62f (diff) | |
| download | mruby-d3c77559754a196476d1c9a5bdd30a8559affe30.tar.gz mruby-d3c77559754a196476d1c9a5bdd30a8559affe30.zip | |
Merge pull request #825 from carsonmcdonald/gembuildfix
Change task rule based on build_dir so main rules don't clobber gem rules
| -rw-r--r-- | tasks/mruby_build_commands.rake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index b3c83277c..884f2027f 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -68,7 +68,11 @@ module MRuby def define_rules(build_dir, source_dir='') @out_ext = build.exts.object - generated_file_matcher = Regexp.new("^#{build_dir}/(.*)#{Regexp.escape out_ext}$") + if build_dir.include? "mrbgems/" + generated_file_matcher = Regexp.new("^#{build_dir}/(.*)#{Regexp.escape out_ext}$") + else + generated_file_matcher = Regexp.new("^#{build_dir}/(?!mrbgems/.+/)(.*)#{Regexp.escape out_ext}$") + end source_exts.each do |ext, compile| rule generated_file_matcher => [ proc { |file| |