summaryrefslogtreecommitdiffhomepage
path: root/tasks
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-03-06 20:42:31 +0900
committerKOBAYASHI Shuji <[email protected]>2019-03-06 20:42:31 +0900
commite2bb5ce079b478fd4c0f7724ed80d41216b228b8 (patch)
tree0a48416dd15c9b3e09a455987d34b05a11e05f2c /tasks
parent06dae1a9b6498bdb710041b68bd52047bb014468 (diff)
downloadmruby-e2bb5ce079b478fd4c0f7724ed80d41216b228b8.tar.gz
mruby-e2bb5ce079b478fd4c0f7724ed80d41216b228b8.zip
Refer also CXX and CC env vars as linker command in gcc and clang toolchain
ref #4292
Diffstat (limited to 'tasks')
-rw-r--r--tasks/toolchains/clang.rake2
-rw-r--r--tasks/toolchains/gcc.rake2
2 files changed, 2 insertions, 2 deletions
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 = []