From 98d0f1b98ec816ca9e943d018ec6aae8e96a245a Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sat, 21 Nov 2020 12:25:50 +0900 Subject: 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. --- tasks/toolchains/gcc.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/toolchains') 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 -- cgit v1.2.3