summaryrefslogtreecommitdiffhomepage
path: root/tasks/mruby_build_commands.rake
diff options
context:
space:
mode:
authorYuichiro MASUI <[email protected]>2013-01-21 12:46:17 +0900
committerYuichiro MASUI <[email protected]>2013-01-21 12:46:17 +0900
commit0defb59053ccd1e6c8637149329989ae81e46c71 (patch)
treed57fb0a99501f312f1af9a694a48cff0555a6b00 /tasks/mruby_build_commands.rake
parent8e86ff2283d427b5cb2a02607e1aab998cb5090c (diff)
downloadmruby-0defb59053ccd1e6c8637149329989ae81e46c71.tar.gz
mruby-0defb59053ccd1e6c8637149329989ae81e46c71.zip
build_config gets more flexibility
Diffstat (limited to 'tasks/mruby_build_commands.rake')
-rw-r--r--tasks/mruby_build_commands.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake
index 023b23763..7014d5a20 100644
--- a/tasks/mruby_build_commands.rake
+++ b/tasks/mruby_build_commands.rake
@@ -50,7 +50,7 @@ module MRuby
FileUtils.mkdir_p File.dirname(outfile)
define_flags = [defines, _defineds].flatten.map{ |d| option_define % d }
include_path_flags = [include_paths, _include_paths, File.dirname(infile)].flatten.map{ |f| option_include_path % filename(f) }
- _run compile_options, { :flags => (flags + define_flags + include_path_flags + _flags).join(' '), :infile => filename(infile), :outfile => filename(outfile) }
+ _run compile_options, { :flags => [flags, define_flags, include_path_flags, _flags].flatten.join(' '), :infile => filename(infile), :outfile => filename(outfile) }
end
def define_rules(build_dir, source_dir='')
@@ -112,7 +112,7 @@ module MRuby
FileUtils.mkdir_p File.dirname(outfile)
library_flags = [libraries, _libraries].flatten.reverse.map{ |d| option_library % d }
library_path_flags = [library_paths, _library_paths].flatten.map{ |f| option_library_path % filename(f) }
- _run link_options, { :flags => (flags + library_path_flags + _flags).join(' '), :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), :libs => library_flags.join(' ') }
+ _run link_options, { :flags => [flags, library_path_flags, _flags].flatten.join(' '), :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), :libs => library_flags.join(' ') }
end
end