diff options
| author | KOBAYASHI Shuji <[email protected]> | 2019-09-13 17:14:37 +0900 |
|---|---|---|
| committer | KOBAYASHI Shuji <[email protected]> | 2019-09-13 17:14:37 +0900 |
| commit | be76cec3422ddedbfce48768db5aec004e2f0aee (patch) | |
| tree | b3ee41f7d8944a70feadb81363aadff2bb0df6d6 /lib | |
| parent | ad4bdda074bb7aa452b17515ea7ad936674c9df1 (diff) | |
| download | mruby-be76cec3422ddedbfce48768db5aec004e2f0aee.tar.gz mruby-be76cec3422ddedbfce48768db5aec004e2f0aee.zip | |
Fix warnings for invalid C++ option with `enable_cxx_abi`; ref #3618, #4703
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mruby/build.rb | 2 | ||||
| -rw-r--r-- | lib/mruby/build/command.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 5bedfc0e6..375b2933a 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -162,7 +162,7 @@ module MRuby compilers.each { |c| c.defines += %w(MRB_ENABLE_CXX_EXCEPTION MRB_ENABLE_CXX_ABI) c.flags << c.cxx_compile_flag - c.flags.delete('-std=gnu99') + c.flags = c.flags.flatten - c.cxx_invalid_flags.flatten } linker.command = cxx.command if toolchains.find { |v| v == 'gcc' } @cxx_abi_enabled = true diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb index a98f2ca7e..bff250c93 100644 --- a/lib/mruby/build/command.rb +++ b/lib/mruby/build/command.rb @@ -41,7 +41,7 @@ module MRuby class Command::Compiler < Command attr_accessor :flags, :include_paths, :defines, :source_exts attr_accessor :compile_options, :option_define, :option_include_path, :out_ext - attr_accessor :cxx_compile_flag, :cxx_exception_flag + attr_accessor :cxx_compile_flag, :cxx_exception_flag, :cxx_invalid_flags def initialize(build, source_exts=[]) super(build) @@ -53,6 +53,7 @@ module MRuby @option_include_path = '-I%s' @option_define = '-D%s' @compile_options = '%{flags} -o %{outfile} -c %{infile}' + @cxx_invalid_flags = [] end alias header_search_paths include_paths |