Merge branch 'mruby' into pr-typeerror-string-start-end-with

Conflicts:
	mrbgems/mruby-string-ext/src/string.c
	mrbgems/mruby-string-ext/test/string.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 0902cb330..c230a5f2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,7 +41,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
     FileUtils.rm_f t.name, { :verbose => $verbose }
     FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
   end
-  
+
   install_path
 end
 
@@ -53,7 +53,7 @@ MRuby.each_target do |target|
 
     gem.bins.each do |bin|
       exec = exefile("#{build_dir}/bin/#{bin}")
-      objs = Dir.glob("#{current_dir}/tools/#{bin}/*.c").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
+      objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
 
       file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t|
         gem_flags = gems.map { |g| g.linker.flags }