From e2bb5ce079b478fd4c0f7724ed80d41216b228b8 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Wed, 6 Mar 2019 20:42:31 +0900 Subject: Refer also CXX and CC env vars as linker command in gcc and clang toolchain ref #4292 --- tasks/toolchains/clang.rake | 2 +- tasks/toolchains/gcc.rake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tasks') diff --git a/tasks/toolchains/clang.rake b/tasks/toolchains/clang.rake index c75fa030c..2832dad5f 100644 --- a/tasks/toolchains/clang.rake +++ b/tasks/toolchains/clang.rake @@ -5,5 +5,5 @@ MRuby::Toolchain.new(:clang) do |conf, _params| cc.command = ENV['CC'] || 'clang' end conf.cxx.command = ENV['CXX'] || 'clang++' - conf.linker.command = ENV['LD'] || 'clang' + conf.linker.command = ENV['LD'] || ENV['CXX'] || ENV['CC'] || 'clang' end diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 2d1e70e6e..663fef9e6 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -20,7 +20,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| end conf.linker do |linker| - linker.command = ENV['LD'] || 'gcc' + linker.command = ENV['LD'] || ENV['CXX'] || ENV['CC'] || 'gcc' linker.flags = [ENV['LDFLAGS'] || %w()] linker.libraries = %w(m) linker.library_paths = [] -- cgit v1.2.3