From af83ad937b612c72dc0bb5768d41b66d478b46aa Mon Sep 17 00:00:00 2001 From: Laurent Sansonetti Date: Mon, 7 May 2012 00:31:15 +0200 Subject: [PATCH] fix bugs in the vendoring code --- lib/motion/project/vendor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/motion/project/vendor.rb b/lib/motion/project/vendor.rb index c2e53005..527559f2 100644 --- a/lib/motion/project/vendor.rb +++ b/lib/motion/project/vendor.rb @@ -8,7 +8,7 @@ module Motion; module Project; include Rake::DSL if Rake.const_defined?(:DSL) def initialize(path, type, config, opts) - @path = path + @path = path.to_s @type = type @config = config @opts = opts @@ -74,7 +74,7 @@ EOS if File.exist?(build_dir) libname = 'lib' + File.basename(@path) + '.a' Dir.chdir(build_dir) do - objs = Dir.glob('*/**/*.o') + objs = Dir.glob('**/*.o') FileUtils.rm_rf libname unless objs.empty? sh "#{@config.locate_binary('ar')} cq #{libname} #{objs.join(' ')}"