summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-01-05 02:19:17 -0800
committerYukihiro "Matz" Matsumoto <[email protected]>2013-01-05 02:19:17 -0800
commit4fd63b7457499ecfc68da5177374b635ccadbcc8 (patch)
tree081d2856a30da23fc2fcac496fda8f718c141f76
parentfe954098b30bc5cec1c0576831b12d089ccc188b (diff)
parentc38b8776c84999000dea01f7e92b1c96af93207a (diff)
downloadmruby-4fd63b7457499ecfc68da5177374b635ccadbcc8.tar.gz
mruby-4fd63b7457499ecfc68da5177374b635ccadbcc8.zip
Merge pull request #690 from matsumoto-r/fix_mrbgems_flags
Add mruby_ldflags when tools/mruby and tools/mrbc link archive files
-rw-r--r--test/mrbtest.rake4
-rw-r--r--tools/mirb/mirb.rake4
-rw-r--r--tools/mrbc/mrbc.rake2
-rw-r--r--tools/mruby/mruby.rake4
4 files changed, 7 insertions, 7 deletions
diff --git a/test/mrbtest.rake b/test/mrbtest.rake
index 1d416df2c..cd560d206 100644
--- a/test/mrbtest.rake
+++ b/test/mrbtest.rake
@@ -11,7 +11,7 @@ MRuby.each_target do
objs = ["#{build_dir}/#{dir}/driver.o", mlib]
file exec => objs + gems.map{ |g| g.testlib } + ["#{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
file mlib => [clib]
@@ -29,4 +29,4 @@ MRuby.each_target do
f.puts "}"
end
end
-end \ No newline at end of file
+end
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