From f6bc6b7692b307b411767ebb748aa428728c4e61 Mon Sep 17 00:00:00 2001 From: MATSUMOTO Ryosuke Date: Sat, 5 Jan 2013 15:12:42 +0900 Subject: Add mruby_ldflags when tools/mruby and tools/mrbc link archive files --- tools/mrbc/mrbc.rake | 4 ++-- tools/mruby/mruby.rake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/mrbc/mrbc.rake b/tools/mrbc/mrbc.rake index 4cca63b6f..c28d652d9 100644 --- a/tools/mrbc/mrbc.rake +++ b/tools/mrbc/mrbc.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_core.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/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 -- cgit v1.2.3 From 1cd7c9fac5274cf1c0207ab15669933a3352680b Mon Sep 17 00:00:00 2001 From: MATSUMOTO Ryosuke Date: Sat, 5 Jan 2013 17:20:01 +0900 Subject: Fix mrbgem options 689#issuecomment-11911431 --- tools/mirb/mirb.rake | 4 ++-- tools/mrbc/mrbc.rake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') 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 c28d652d9..cf356ba4f 100644 --- a/tools/mrbc/mrbc.rake +++ b/tools/mrbc/mrbc.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_core.a"] do |t| - link t.name, t.prerequisites, gems.map { |g| g.mruby_ldflags }, gems.map { |g| g.mruby_libs } + link t.name, t.prerequisites, [], gems.map { |g| g.mruby_libs } end end -- cgit v1.2.3