diff options
| author | Daniel Bovensiepen <[email protected]> | 2013-01-08 10:07:55 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2013-01-08 10:07:55 +0800 |
| commit | a096dc9e3b01f4fc31fc1f910e254813884a776e (patch) | |
| tree | cd353be9cb1df5e009d130ceabfcd627e7fb34a7 /tools | |
| parent | af75d8de2ca6b3eda97c588334b15920e856a53b (diff) | |
| parent | 8c31c2006be7afa8da1fd01180955b108aee868c (diff) | |
| download | mruby-a096dc9e3b01f4fc31fc1f910e254813884a776e.tar.gz mruby-a096dc9e3b01f4fc31fc1f910e254813884a776e.zip | |
Merge remote-tracking branch 'mruby/master' into array-clear
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mirb/mirb.rake | 4 | ||||
| -rw-r--r-- | tools/mrbc/mrbc.rake | 2 | ||||
| -rw-r--r-- | tools/mruby/mruby.rake | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/mirb/mirb.rake b/tools/mirb/mirb.rake index 045f6ab90..52f334420 100644 --- a/tools/mirb/mirb.rake +++ b/tools/mirb/mirb.rake @@ -5,6 +5,6 @@ MRuby.each_target do 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_libs } + link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } end -end
\ No newline at end of file +end diff --git a/tools/mrbc/mrbc.rake b/tools/mrbc/mrbc.rake index 4cca63b6f..cf356ba4f 100644 --- a/tools/mrbc/mrbc.rake +++ b/tools/mrbc/mrbc.rake @@ -7,4 +7,4 @@ MRuby.each_target do file exec => objs + ["#{build_dir}/lib/libmruby_core.a"] do |t| link t.name, t.prerequisites, [], gems.map { |g| g.mruby_libs } end -end
\ No newline at end of file +end diff --git a/tools/mruby/mruby.rake b/tools/mruby/mruby.rake index 4159fadfd..162e8d1ba 100644 --- a/tools/mruby/mruby.rake +++ b/tools/mruby/mruby.rake @@ -5,6 +5,6 @@ MRuby.each_target do 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_libs } + link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } end -end
\ No newline at end of file +end |