diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-20 23:16:05 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-20 23:16:05 +0900 |
| commit | ee274ba30f3b697e0855fe7c093136f3c8b80f6f (patch) | |
| tree | 2e521f27741d48623a723da544378f549459a948 /tasks | |
| parent | 929328ad3bfc3f7b0e5d01b707098a93038f3413 (diff) | |
| parent | 9ac23ae214b665f81da4a5d3c00c6d17cdb3961a (diff) | |
| download | mruby-ee274ba30f3b697e0855fe7c093136f3c8b80f6f.tar.gz mruby-ee274ba30f3b697e0855fe7c093136f3c8b80f6f.zip | |
Merge pull request #2299 from take-cheeze/cc_ext
Support extension '.cc' in source code listing.
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/mrbgem_spec.rake | 4 | ||||
| -rw-r--r-- | tasks/mruby_build_gem.rake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake index ffcf79032..67edffbc5 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -58,13 +58,13 @@ module MRuby @linker = LinkerConfig.new([], [], [], []) @rbfiles = Dir.glob("#{dir}/mrblib/*.rb").sort - @objs = Dir.glob("#{dir}/src/*.{c,cpp,cxx,m,asm,S}").map do |f| + @objs = Dir.glob("#{dir}/src/*.{c,cpp,cxx,cc,m,asm,S}").map do |f| objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) end @objs << objfile("#{build_dir}/gem_init") @test_rbfiles = Dir.glob("#{dir}/test/*.rb") - @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,m,asm,S}").map do |f| + @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,cc,m,asm,S}").map do |f| objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) end @test_preload = nil # 'test/assert.rb' diff --git a/tasks/mruby_build_gem.rake b/tasks/mruby_build_gem.rake index 766266680..e58dc5c71 100644 --- a/tasks/mruby_build_gem.rake +++ b/tasks/mruby_build_gem.rake @@ -35,8 +35,8 @@ module MRuby Gem.current.build_config_initializer = block gems << Gem.current - cxx_srcs = Dir.glob("#{Gem.current.dir}/src/*.{cpp,cxx}") - cxx_srcs += Dir.glob("#{Gem.current.dir}/test/*.{cpp,cxx}") + cxx_srcs = Dir.glob("#{Gem.current.dir}/src/*.{cpp,cxx,cc}") + cxx_srcs += Dir.glob("#{Gem.current.dir}/test/*.{cpp,cxx,cc}") enable_cxx_abi unless cxx_srcs.empty? Gem.current |