summaryrefslogtreecommitdiffhomepage
path: root/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'tasks')
-rw-r--r--tasks/libmruby.rake2
-rw-r--r--tasks/toolchains/android.rake2
2 files changed, 3 insertions, 1 deletions
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake
index 23663d0a5..540aa3eb5 100644
--- a/tasks/libmruby.rake
+++ b/tasks/libmruby.rake
@@ -16,6 +16,8 @@ MRuby.each_target do
gem_libraries = gems.map { |g| g.linker.libraries }
f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries)}"
+
+ f.puts "MRUBY_LIBMRUBY_PATH = #{libfile("#{build_dir}/lib/libmruby")}"
end
end
task :all => "#{build_dir}/lib/libmruby.flags.mak"
diff --git a/tasks/toolchains/android.rake b/tasks/toolchains/android.rake
index e69dbf5a6..c59da7fcb 100644
--- a/tasks/toolchains/android.rake
+++ b/tasks/toolchains/android.rake
@@ -263,7 +263,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter
case toolchain
when :gcc
when :clang
- flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}" -Wno-invalid-command-line-argument -Wno-unused-command-line-argument)
+ flags += %W(-gcc-toolchain "#{gcc_toolchain_path}" -Wno-invalid-command-line-argument -Wno-unused-command-line-argument)
end
flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes)