mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Merge pull request #790 from carsonmcdonald/nogemdefchange
Change the way that the DISABLE_GEMS flag is set.
This commit is contained in:
@@ -37,7 +37,6 @@ module MRuby
|
||||
MRuby::Gem.current = self
|
||||
|
||||
@build.compilers.each do |compiler|
|
||||
compiler.defines -= %w(DISABLE_GEMS)
|
||||
compiler.include_paths << "#{dir}/include"
|
||||
end
|
||||
MRuby::Build::COMMANDS.each do |command|
|
||||
|
||||
@@ -83,7 +83,11 @@ module MRuby
|
||||
instance_eval(&block)
|
||||
|
||||
compilers.each do |compiler|
|
||||
compiler.defines -= %w(DISABLE_GEMS) if respond_to?(:enable_gems?) && enable_gems?
|
||||
if respond_to?(:enable_gems?) && enable_gems?
|
||||
compiler.defines -= %w(DISABLE_GEMS)
|
||||
else
|
||||
compiler.defines += %w(DISABLE_GEMS)
|
||||
end
|
||||
compiler.define_rules build_dir
|
||||
end
|
||||
end
|
||||
|
||||
@@ -40,7 +40,7 @@ module MRuby
|
||||
@flags = [ENV['CFLAGS'] || []]
|
||||
@source_exts = source_exts
|
||||
@include_paths = ["#{build.root}/include"]
|
||||
@defines = %w(DISABLE_GEMS)
|
||||
@defines = %w()
|
||||
@option_include_path = '-I%s'
|
||||
@option_define = '-D%s'
|
||||
@compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}"
|
||||
|
||||
Reference in New Issue
Block a user