Fixed substituting RbConfig::CONFIG for cc, c++, cpp.

rubinius · May 19, 2016 · 98adcd1 · 98adcd1
1 parent 533fbe0
commit 98adcd1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/rbconfig.rb b/core/rbconfig.rb
@@ -85,9 +85,9 @@ module RbConfig
   CONFIG["NROFF"]              = "/usr/bin/nroff"
   CONFIG["MAKEDIRS"]           = "mkdir -p"
   # compile tools
-  CONFIG["CC"]                 = (ENV["CC"] || Rubinius::BUILD_CONFIG[:cc].sub(/^(gcc|clang)/, "cc")).dup
-  CONFIG["CXX"]                = (ENV["CXX"] || Rubinius::BUILD_CONFIG[:cxx].sub(/^(g|clang)\+\+/, "c++")).dup
-  CONFIG["CPP"]                = "#{(ENV["CPP"] || Rubinius::BUILD_CONFIG[:cc].sub(/^(gcc|clang)/, "cc"))} -E"
+  CONFIG["CC"]                 = (ENV["CC"] || Rubinius::BUILD_CONFIG[:cc].sub(/^(gcc|clang).*$/, "cc")).dup
+  CONFIG["CXX"]                = (ENV["CXX"] || Rubinius::BUILD_CONFIG[:cxx].sub(/^(g|clang)\+\+.*$/, "c++")).dup
+  CONFIG["CPP"]                = "#{(ENV["CPP"] || Rubinius::BUILD_CONFIG[:cc].sub(/^(gcc|clang).*$/, "cc"))} -E"
   CONFIG["YACC"]               = "bison -y"
   CONFIG["RANLIB"]             = "ranlib"
   CONFIG["AR"]                 = "ar"