summaryrefslogtreecommitdiffhomepage
path: root/tasks
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-03-05 21:53:07 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-03-05 21:53:07 +0900
commitfaf48bb761e4ee03115dc88d7588d1a7afa83270 (patch)
tree2688ca7242fd16b9fae0c847327d432f06838487 /tasks
parentadc5b56c157a5572f10d8dfeb74e7dfc57038d58 (diff)
parent61d06abf815fb6ec13a9e30367a8e74d288dc85b (diff)
downloadmruby-faf48bb761e4ee03115dc88d7588d1a7afa83270.tar.gz
mruby-faf48bb761e4ee03115dc88d7588d1a7afa83270.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'tasks')
-rw-r--r--tasks/libmruby.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake
index 8406d8abc..887cc69aa 100644
--- a/tasks/libmruby.rake
+++ b/tasks/libmruby.rake
@@ -6,13 +6,13 @@ MRuby.each_target do
gem_flags = gems.map { |g| g.linker.flags }
gem_library_paths = gems.map { |g| g.linker.library_paths }
- f.puts "MRUBY_LDFLAGS = #{linker.all_flags(gem_library_paths, gem_flags).gsub('"', '\\"')}"
+ f.puts "MRUBY_LDFLAGS = #{linker.all_flags(gem_library_paths, gem_flags).gsub('"', '\\"')} #{linker.option_library_path % "#{build_dir}/lib"}"
gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
f.puts "MRUBY_LDFLAGS_BEFORE_LIBS = #{[linker.flags_before_libraries, gem_flags_before_libraries].flatten.join(' ').gsub('"', '\\"')}"
gem_libraries = gems.map { |g| g.linker.libraries }
- f.puts "MRUBY_LIBS = #{linker.option_library_path % "#{build_dir}/lib"} #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries).gsub('"', '\\"')}"
+ f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries).gsub('"', '\\"')}"
end
end
end