diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-11-21 14:38:00 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-21 14:38:00 +0900 |
| commit | 5f7eb20256bfd5ba9c7ce4f400401c9253eb8439 (patch) | |
| tree | 43b32cc52912cf0034fb8269989c2502687cb9a0 | |
| parent | fb028b47aa6fb730f3e5b866d51577636b9a1ba3 (diff) | |
| parent | 98d0f1b98ec816ca9e943d018ec6aae8e96a245a (diff) | |
| download | mruby-5f7eb20256bfd5ba9c7ce4f400401c9253eb8439.tar.gz mruby-5f7eb20256bfd5ba9c7ce4f400401c9253eb8439.zip | |
Merge pull request #5156 from shuujii/improve-determining-C++-compiler-in-tasks-toolchains-gcc.rake
Improve determining C++ compiler in `tasks/toolchains/gcc.rake`
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index b5d6e1f25..34d747af5 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -6,7 +6,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| [conf.cc, conf.objc, conf.asm, conf.cxx].each do |compiler| if compiler == conf.cxx - compiler.command = ENV['CXX'] || default_command.sub(/cc|$/, '++') + compiler.command = ENV['CXX'] || conf.cc.command.sub(/g\Kcc|$/, '++') compiler.flags = [ENV['CXXFLAGS'] || ENV['CFLAGS'] || compiler_flags] else compiler.command = ENV['CC'] || default_command |