diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mruby/build.rb | 3 | ||||
| -rw-r--r-- | lib/mruby/build/command.rb | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index a99c0f507..f82eb9401 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -71,7 +71,7 @@ module MRuby include Rake::DSL include LoadGems - attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir + attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir, :defines attr_reader :products, :libmruby_core_objs, :libmruby_objs, :gems, :toolchains, :presym, :mrbc_build, :gem_dir_to_repo_url alias libmruby libmruby_objs @@ -97,6 +97,7 @@ module MRuby @file_separator = '/' @build_dir = "#{build_dir}/#{@name}" @gem_clone_dir = "#{build_dir}/repos/#{@name}" + @defines = [] @cc = Command::Compiler.new(self, %w(.c), label: "CC") @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp), label: "CXX") @objc = Command::Compiler.new(self, %w(.m), label: "OBJC") diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb index dbe3763d9..c93d08ea7 100644 --- a/lib/mruby/build/command.rb +++ b/lib/mruby/build/command.rb @@ -51,7 +51,7 @@ module MRuby @flags = [ENV['CFLAGS'] || []] @source_exts = source_exts @include_paths = ["#{MRUBY_ROOT}/include"] - @defines = %w() + @defines = [] @option_include_path = %q[-I"%s"] @option_define = %q[-D"%s"] @compile_options = %q[%{flags} -o "%{outfile}" -c "%{infile}"] @@ -77,7 +77,7 @@ module MRuby end def all_flags(_defines=[], _include_paths=[], _flags=[]) - define_flags = [defines, _defines].flatten.map{ |d| option_define % d } + define_flags = [defines, _defines, build.defines].flatten.map{ |d| option_define % d } include_path_flags = [include_paths, _include_paths].flatten.map do |f| option_include_path % filename(f) end @@ -277,7 +277,7 @@ module MRuby def initialize(build) super @command = 'git' - @flags = %w[] + @flags = [] @clone_options = "clone %{flags} %{url} %{dir}" @pull_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} pull" @checkout_options = "--git-dir %{repo_dir}/.git --work-tree %{repo_dir} checkout %{checksum_hash}" |