superenv: move MacSystem into separate file

This makes it requirable before superenv becomes active.

2 files changed, 34 insertions, 34 deletions

diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index e2c87577f..b79bba914 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -1,5 +1,6 @@
 require 'extend/ENV'
 require 'macos'
+require 'superenv/macsystem'
 
 ### Why `superenv`?
 # 1) Only specify the environment we need (NO LDFLAGS for cmake)
@@ -285,37 +286,3 @@ class Array
     map(&:to_s).uniq.select{|s| File.directory? s }.join(':').chuzzle
   end
 end
-
-# new code because I don't really trust the Xcode code now having researched it more
-module MacSystem extend self
-  def xcode_clt_installed?
-    File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb"
-  end
-
-  def xcode43_without_clt?
-    MacOS::Xcode.version >= "4.3" and not MacSystem.xcode_clt_installed?
-  end
-
-  def x11_prefix
-    @x11_prefix ||= %W[/opt/X11 /usr/X11
-      #{MacOS.sdk_path}/usr/X11].find{|path| File.directory? "#{path}/include" }
-  end
-
-  def xcode43_developer_dir
-    @xcode43_developer_dir ||=
-      tst(ENV['DEVELOPER_DIR']) ||
-      tst(`xcode-select -print-path 2>/dev/null`) ||
-      tst("/Applications/Xcode.app/Contents/Developer") ||
-      MacOS.mdfind("com.apple.dt.Xcode").find{|path| tst(path) }
-    raise unless @xcode43_developer_dir
-    @xcode43_developer_dir
-  end
-
-  private
-
-  def tst prefix
-    prefix = prefix.to_s.chomp
-    xcrun = "#{prefix}/usr/bin/xcrun"
-    prefix if xcrun != "/usr/bin/xcrun" and File.executable? xcrun
-  end
-end
diff --git a/Library/Homebrew/superenv/macsystem.rb b/Library/Homebrew/superenv/macsystem.rb
new file mode 100644
index 000000000..5f16b8fad
--- /dev/null
+++ b/Library/Homebrew/superenv/macsystem.rb
@@ -0,0 +1,33 @@
+# new code because I don't really trust the Xcode code now having researched it more
+module MacSystem extend self
+  def xcode_clt_installed?
+    File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb"
+  end
+
+  def xcode43_without_clt?
+    MacOS::Xcode.version >= "4.3" and not MacSystem.xcode_clt_installed?
+  end
+
+  def x11_prefix
+    @x11_prefix ||= %W[/opt/X11 /usr/X11
+      #{MacOS.sdk_path}/usr/X11].find{|path| File.directory? "#{path}/include" }
+  end
+
+  def xcode43_developer_dir
+    @xcode43_developer_dir ||=
+      tst(ENV['DEVELOPER_DIR']) ||
+      tst(`xcode-select -print-path 2>/dev/null`) ||
+      tst("/Applications/Xcode.app/Contents/Developer") ||
+      MacOS.mdfind("com.apple.dt.Xcode").find{|path| tst(path) }
+    raise unless @xcode43_developer_dir
+    @xcode43_developer_dir
+  end
+
+  private
+
+  def tst prefix
+    prefix = prefix.to_s.chomp
+    xcrun = "#{prefix}/usr/bin/xcrun"
+    prefix if xcrun != "/usr/bin/xcrun" and File.executable? xcrun
+  end
+end