summaryrefslogtreecommitdiffhomepage
path: root/tasks
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-09-13 21:28:23 +0900
committerKOBAYASHI Shuji <[email protected]>2019-09-13 21:28:23 +0900
commit895ab2342edecbf7911ec9a8753d632f52f1e6ff (patch)
treecac26518e44bf453278e182dd160d052c94444bc /tasks
parent1e82b1958baaa9286b6405db0d009b028e9af72a (diff)
downloadmruby-895ab2342edecbf7911ec9a8753d632f52f1e6ff.tar.gz
mruby-895ab2342edecbf7911ec9a8753d632f52f1e6ff.zip
Revert part of "Refine `tasks/toolchains/(gcc|clang).rake`" (07c6b7f0)
`-Wzero-length-array` is not a mandatory option, so the original is better.
Diffstat (limited to 'tasks')
-rw-r--r--tasks/toolchains/clang.rake5
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