From 5c1f463ac0f1ac8b3dffc5d235071f9759aa5633 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 10 May 2016 08:19:48 +0100
Subject: [PATCH] Move more methods to DevelopmentTools.

Closes #1028.
---
 Library/Homebrew/cmd/test-bot.rb      |  2 +-
 Library/Homebrew/development_tools.rb | 15 +++++++++++++++
 Library/Homebrew/os/mac.rb            | 15 ---------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index a01467036b..db82f565b8 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -469,7 +469,7 @@ module Homebrew
         unless installed_gcc
           run_as_not_developer { test "brew", "install", "gcc" }
           installed_gcc = true
-          OS::Mac.clear_version_cache
+          DevelopmentTools.clear_version_cache
           retry
         end
         skip formula_name
diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb
index fd0d2f2630..a301bc6157 100644
--- a/Library/Homebrew/development_tools.rb
+++ b/Library/Homebrew/development_tools.rb
@@ -74,6 +74,21 @@ class DevelopmentTools
           `#{path} --version`[/clang-(\d{2,})/, 1].to_i
         end
     end
+
+    def non_apple_gcc_version(cc)
+      (@non_apple_gcc_version ||= {}).fetch(cc) do
+        path = HOMEBREW_PREFIX.join("opt", "gcc", "bin", cc)
+        path = locate(cc) unless path.exist?
+        version = `#{path} --version`[/gcc(?:-\d(?:\.\d)? \(.+\))? (\d\.\d\.\d)/, 1] if path
+        @non_apple_gcc_version[cc] = version
+      end
+    end
+
+    def clear_version_cache
+      @gcc_40_build_version = @gcc_42_build_version = @llvm_build_version = nil
+      @clang_version = @clang_build_version = nil
+      @non_apple_gcc_version = {}
+    end
   end
 end
 
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 31469dfddc..5d2447c8de 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -109,21 +109,6 @@ module OS
       s.path unless s.nil?
     end
 
-    def non_apple_gcc_version(cc)
-      (@non_apple_gcc_version ||= {}).fetch(cc) do
-        path = HOMEBREW_PREFIX.join("opt", "gcc", "bin", cc)
-        path = DevelopmentTools.locate(cc) unless path.exist?
-        version = `#{path} --version`[/gcc(?:-\d(?:\.\d)? \(.+\))? (\d\.\d\.\d)/, 1] if path
-        @non_apple_gcc_version[cc] = version
-      end
-    end
-
-    def clear_version_cache
-      @gcc_40_build_version = @gcc_42_build_version = @llvm_build_version = nil
-      @clang_version = @clang_build_version = nil
-      @non_apple_gcc_version = {}
-    end
-
     # See these issues for some history:
     # https://github.com/Homebrew/legacy-homebrew/issues/13
     # https://github.com/Homebrew/legacy-homebrew/issues/41