ext/re2/extconf.rb in re2-1.1.0 vs ext/re2/extconf.rb in re2-1.1.1

@@ -4,11 +4,18 @@
 # Copyright (c) 2010-2012, Paul Mucur (http://mudge.name)
 # Released under the BSD Licence, please see LICENSE.txt
 
 require 'mkmf'
 
-RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
-RbConfig::MAKEFILE_CONFIG["CXX"] = ENV["CXX"] if ENV["CXX"]
+if ENV["CC"]
+  RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
+  RbConfig::CONFIG["CC"] = ENV["CC"]
+end
+
+if ENV["CXX"]
+  RbConfig::MAKEFILE_CONFIG["CXX"] = ENV["CXX"]
+  RbConfig::CONFIG["CXX"] = ENV["CXX"]
+end
 
 incl, lib = dir_config("re2", "/usr/local/include", "/usr/local/lib")
 
 $CFLAGS << " -Wall -Wextra -funroll-loops"