diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-03-06 22:26:34 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-06 22:26:34 +0900 |
| commit | bf922c9f7a484621e43faf8e26db491a33422d63 (patch) | |
| tree | 6b92665ccc7c6f0300b681883a9e12289cec13a1 | |
| parent | 06e07cbcd8eb1888c57985216048778ea774ac6f (diff) | |
| parent | e2bb5ce079b478fd4c0f7724ed80d41216b228b8 (diff) | |
| download | mruby-bf922c9f7a484621e43faf8e26db491a33422d63.tar.gz mruby-bf922c9f7a484621e43faf8e26db491a33422d63.zip | |
Merge pull request #4315 from shuujii/refer-also-CXX-and-CC-env-vars-as-linker-command
Refer also CXX and CC env vars as linker command in gcc and clang toolchain
| -rw-r--r-- | tasks/toolchains/clang.rake | 2 | ||||
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 |
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 = [] |