diff options
| author | KOBAYASHI Shuji <[email protected]> | 2020-11-21 12:25:50 +0900 |
|---|---|---|
| committer | KOBAYASHI Shuji <[email protected]> | 2020-11-21 12:25:50 +0900 |
| commit | 98d0f1b98ec816ca9e943d018ec6aae8e96a245a (patch) | |
| tree | 43b32cc52912cf0034fb8269989c2502687cb9a0 /tasks | |
| parent | fb028b47aa6fb730f3e5b866d51577636b9a1ba3 (diff) | |
| download | mruby-98d0f1b98ec816ca9e943d018ec6aae8e96a245a.tar.gz mruby-98d0f1b98ec816ca9e943d018ec6aae8e96a245a.zip | |
Improve determining C++ compiler in `tasks/toolchains/gcc.rake`
* Consider CC envvar as C compiler on which to make the decision.
* Consider the case where C compiler is `ccache gcc`, etc.
Diffstat (limited to 'tasks')
| -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 |