From 8424452c698aecb77c7f7d4af354a53f70d4f472 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 12 Apr 2016 07:22:21 +0000 Subject: merge revision(s) 53566: * configure.in: improve ICC (Intel C Compiler) support. * configure.in (CXX): The name of icc's c++ compiler is `icpc`. * configure.in (warnings): Add `-diag-disable=2259` to suppress noisy warnings: "non-pointer conversion from "..." to "..." may lose significant bits". * configure.in (optflags): Add `-fp-model precise` like -fno-fast-math. * lib/mkmf.rb: icc supports -Werror=division-by-zero and -Werror=deprecated-declarations, but doesn't support -Wdivision-by-zero and -Wdeprecated-declarations. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/mkmf.rb') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d8bc1b525d..3c944eecf5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2475,6 +2475,9 @@ site-install-rb: install-rb if $warnflags = CONFIG['warnflags'] and CONFIG['GCC'] == 'yes' # turn warnings into errors only for bundled extensions. config['warnflags'] = $warnflags.gsub(/(\A|\s)-Werror[-=]/, '\1-W') + if /icc\z/ =~ config['CC'] + config['warnflags'].gsub!(/(\A|\s)-W(?:division-by-zero|deprecated-declarations)/, '\1') + end RbConfig.expand(rbconfig['warnflags'] = config['warnflags'].dup) config.each do |key, val| RbConfig.expand(rbconfig[key] = val.dup) if /warnflags/ =~ val -- cgit v1.2.3