diff options
| author | mattn <[email protected]> | 2013-01-10 10:04:07 +0900 |
|---|---|---|
| committer | mattn <[email protected]> | 2013-01-10 10:04:07 +0900 |
| commit | ee0f73a46a17411f6dfc88163bf5d76241932a48 (patch) | |
| tree | 00c9c8bd8346598b6f2e2e0a608f376197f656c8 /tools | |
| parent | ef4b0c6cd3442598169dad9e6861d3c2db271f58 (diff) | |
| parent | 5804e7682ecbd59c1a9cea56c9ad008cff206713 (diff) | |
| download | mruby-ee0f73a46a17411f6dfc88163bf5d76241932a48.tar.gz mruby-ee0f73a46a17411f6dfc88163bf5d76241932a48.zip | |
Merge branch 'master' of https://github.com/mruby/mruby
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mirb/mirb.rake | 10 | ||||
| -rw-r--r-- | tools/mrbc/mrbc.rake | 10 | ||||
| -rw-r--r-- | tools/mruby/mruby.rake | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/tools/mirb/mirb.rake b/tools/mirb/mirb.rake index 52f334420..958ebe79a 100644 --- a/tools/mirb/mirb.rake +++ b/tools/mirb/mirb.rake @@ -1,10 +1,12 @@ dir = File.dirname(__FILE__).sub(%r|^\./|, '') MRuby.each_target do - exec = exefile("#{build_dir}/bin/mirb") - objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } + if bins.select { |s| s.to_s == 'mirb' } + exec = exefile("#{build_dir}/bin/mirb") + objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } - file exec => objs + ["#{build_dir}/lib/libmruby.a"] do |t| - link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } + file exec => objs + ["#{build_dir}/lib/libmruby.a"] do |t| + link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } + end end end diff --git a/tools/mrbc/mrbc.rake b/tools/mrbc/mrbc.rake index cf356ba4f..bff88312a 100644 --- a/tools/mrbc/mrbc.rake +++ b/tools/mrbc/mrbc.rake @@ -1,10 +1,12 @@ dir = File.dirname(__FILE__).sub(%r|^\./|, '') MRuby.each_target do - exec = exefile("#{build_dir}/bin/mrbc") - objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } + if bins.select { |s| s.to_s == 'mrbc' } + exec = exefile("#{build_dir}/bin/mrbc") + objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } - file exec => objs + ["#{build_dir}/lib/libmruby_core.a"] do |t| - link t.name, t.prerequisites, [], gems.map { |g| g.mruby_libs } + file exec => objs + ["#{build_dir}/lib/libmruby_core.a"] do |t| + link t.name, t.prerequisites, [], gems.map { |g| g.mruby_libs } + end end end diff --git a/tools/mruby/mruby.rake b/tools/mruby/mruby.rake index 162e8d1ba..7842c4266 100644 --- a/tools/mruby/mruby.rake +++ b/tools/mruby/mruby.rake @@ -1,10 +1,12 @@ dir = File.dirname(__FILE__).sub(%r|^\./|, '') MRuby.each_target do - exec = exefile("#{build_dir}/bin/mruby") - objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } + if bins.select { |s| s.to_s == 'mruby' } + exec = exefile("#{build_dir}/bin/mruby") + objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } - file exec => objs + ["#{build_dir}/lib/libmruby.a"] do |t| - link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } + file exec => objs + ["#{build_dir}/lib/libmruby.a"] do |t| + link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } + end end end |