kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-13 22:45:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

build the bs flags only once

Browse Source
This commit is contained in:
Laurent Sansonetti
2013-08-20 18:01:21 +02:00
parent 7bcf279148
commit ab276a5d18
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/motion/project/builder.rb
View File

@@ -87,6 +87,7 @@ module Motion; module Project;
any_obj_file_built = false
project_files = Dir.glob("**/*.rb").map{ |x| File.expand_path(x) }
is_default_archs = (archs == config.default_archs[platform])
rubyc_bs_flags = bs_files.map { |x| "--uses-bs \"" + x + "\" " }.join(' ')
build_file = Proc.new do |files_build_dir, path|
rpath = path
@@ -113,9 +114,8 @@ module Motion; module Project;
# LLVM bitcode.
bc = File.join(files_build_dir, "#{path}.#{arch}.bc")
bs_flags = bs_files.map { |x| "--uses-bs \"" + x + "\" " }.join(' ')
arch_cmd = (arch =~ /^arm/) ? "/usr/bin/arch -arch i386" : "/usr/bin/arch -arch #{arch}"
sh "/usr/bin/env VM_KERNEL_PATH=\"#{kernel}\" VM_OPT_LEVEL=\"#{config.opt_level}\" #{arch_cmd} #{ruby} #{bs_flags} --emit-llvm \"#{bc}\" #{init_func} \"#{path}\""
sh "/usr/bin/env VM_KERNEL_PATH=\"#{kernel}\" VM_OPT_LEVEL=\"#{config.opt_level}\" #{arch_cmd} #{ruby} #{rubyc_bs_flags} --emit-llvm \"#{bc}\" #{init_func} \"#{path}\""
# Assembly.
asm = File.join(files_build_dir, "#{path}.#{arch}.s")
@@ -144,7 +144,7 @@ module Motion; module Project;
[obj, init_func]
end
# Resolve file dependencies
# Resolve file dependencies.
if config.detect_dependencies == true
config.dependencies = Dependency.new(config.files - config.exclude_from_detect_dependencies, config.dependencies).run
end