Merge remote-tracking branch 'origin/master' into insecure_audit

1 files changed, 8 insertions, 14 deletions

diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb
index ea7f5837d..625d5ea86 100644
--- a/Library/Homebrew/development_tools.rb
+++ b/Library/Homebrew/development_tools.rb
@@ -34,15 +34,11 @@ class DevelopmentTools
     end
 
     def default_compiler
-      if default_cc =~ /^gcc/
-        :gcc
-      else
-        :clang
-      end
+      :clang
     end
 
-    def gcc_40_build_version
-      @gcc_40_build_version ||= begin
+    def gcc_4_0_build_version
+      @gcc_4_0_build_version ||= begin
         if (path = locate("gcc-4.0")) &&
            build_version = `#{path} --version 2>/dev/null`[/build (\d{4,})/, 1]
           Version.new build_version
@@ -51,10 +47,9 @@ class DevelopmentTools
         end
       end
     end
-    alias gcc_4_0_build_version gcc_40_build_version
 
-    def gcc_42_build_version
-      @gcc_42_build_version ||= begin
+    def gcc_4_2_build_version
+      @gcc_4_2_build_version ||= begin
         gcc = locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2")
         if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm")&&
            build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1]
@@ -64,7 +59,6 @@ class DevelopmentTools
         end
       end
     end
-    alias gcc_build_version gcc_42_build_version
 
     def clang_version
       @clang_version ||= begin
@@ -115,13 +109,13 @@ class DevelopmentTools
     end
 
     def clear_version_cache
-      @gcc_40_build_version = @gcc_42_build_version = nil
+      @gcc_4_0_build_version = @gcc_4_2_build_version = nil
       @clang_version = @clang_build_version = nil
       @non_apple_gcc_version = {}
     end
 
-    def tar_supports_xz?
-      false
+    def curl_handles_most_https_homepages?
+      true
     end
   end
 end