diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-09-13 22:55:50 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-13 22:55:50 +0900 |
| commit | 5489fae8f24782336e500efe56ae741c5d924174 (patch) | |
| tree | cac26518e44bf453278e182dd160d052c94444bc | |
| parent | 1e82b1958baaa9286b6405db0d009b028e9af72a (diff) | |
| parent | 895ab2342edecbf7911ec9a8753d632f52f1e6ff (diff) | |
| download | mruby-5489fae8f24782336e500efe56ae741c5d924174.tar.gz mruby-5489fae8f24782336e500efe56ae741c5d924174.zip | |
Merge pull request #4705 from shuujii/revert-part-of-Refine-tasks-toolchains-gcc-clang.rake
Revert part of "Refine `tasks/toolchains/(gcc|clang).rake`" (07c6b7f0)
| -rw-r--r-- | tasks/toolchains/clang.rake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tasks/toolchains/clang.rake b/tasks/toolchains/clang.rake index b38f531b7..543cb73db 100644 --- a/tasks/toolchains/clang.rake +++ b/tasks/toolchains/clang.rake @@ -1,7 +1,8 @@ MRuby::Toolchain.new(:clang) do |conf, _params| toolchain :gcc, default_command: 'clang' - [conf.cc, conf.objc, conf.asm, conf.cxx].each do |compiler| - compiler.flags.unshift('-Wzero-length-array') + [conf.cc, conf.objc, conf.asm].each do |cc| + cc.flags << '-Wzero-length-array' unless ENV['CFLAGS'] end + conf.cxx.flags << '-Wzero-length-array' unless ENV['CXXFLAGS'] || ENV['CFLAGS'] end |