Merge pull request #4959 from dsisnero/master

build when directories and files have spaces

1 files changed, 6 insertions, 6 deletions

diff --git a/tasks/toolchains/openwrt.rake b/tasks/toolchains/openwrt.rake
index aeb6dbcbc..c376d96ec 100644
--- a/tasks/toolchains/openwrt.rake
+++ b/tasks/toolchains/openwrt.rake
@@ -5,18 +5,18 @@ MRuby::Toolchain.new(:openwrt) do |conf|
     cc.command = ENV['TARGET_CC']
     cc.flags = ENV['TARGET_CFLAGS']
     cc.include_paths = ["#{MRUBY_ROOT}/include"]
-    cc.option_include_path = '-I%s'
+    cc.option_include_path = %q[-I"%s"]
     cc.option_define = '-D%s'
-    cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
+    cc.compile_options = %q[%{flags} -MMD -o "%{outfile}" -c "%{infile}"]
   end
 
   [conf.cxx].each do |cxx|
     cxx.command = ENV['TARGET_CXX']
     cxx.flags = ENV['TARGET_CXXFLAGS']
     cxx.include_paths = ["#{MRUBY_ROOT}/include"]
-    cxx.option_include_path = '-I%s'
+    cxx.option_include_path = %q[-I"%s"]
     cxx.option_define = '-D%s'
-    cxx.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
+    cxx.compile_options = %q[%{flags} -MMD -o "%{outfile}" -c "%{infile}"]
    end
 
   conf.linker do |linker|
@@ -26,11 +26,11 @@ MRuby::Toolchain.new(:openwrt) do |conf|
     linker.library_paths = []
     linker.option_library = '-l%s'
     linker.option_library_path = '-L%s'
-    linker.link_options = '%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
+    linker.link_options = '%{flags} -o "%{outfile}" %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}'
   end
 
   conf.archiver do |archiver|
     archiver.command = ENV['TARGET_AR']
-    archiver.archive_options = 'rs %{outfile} %{objs}'
+    archiver.archive_options = 'rs "%{outfile}" %{objs}'
   end
 end