From b4a5fb4d3ad01d3570ad1bc575f4bc347c4e71a3 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Mon, 19 Aug 2013 12:32:56 -0500
Subject: Move superbin into Superenv module

---
 Library/Homebrew/superenv.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index dfaee9324..8b9f38b0e 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -11,13 +11,9 @@ require 'macos'
 # 7) Simpler formula that *just work*
 # 8) Build-system agnostic configuration of the tool-chain
 
-def superbin
-  @bin ||= (HOMEBREW_REPOSITORY/"Library/ENV").children.reject{|d| d.basename.to_s > MacOS::Xcode.version }.max
-end
-
 def superenv?
   return false if MacOS::Xcode.without_clt? && MacOS.sdk_path.nil?
-  return false unless superbin && superbin.directory?
+  return false unless Superenv.bin && Superenv.bin.directory?
   return false if ARGV.include? "--env=std"
   true
 end
@@ -31,6 +27,10 @@ module Superenv
     base.deps = []
   end
 
+  def self.bin
+    @bin ||= (HOMEBREW_REPOSITORY/"Library/ENV").children.reject{|d| d.basename.to_s > MacOS::Xcode.version }.max
+  end
+
   def reset
     %w{CC CXX OBJC OBJCXX CPP MAKE LD LDSHARED
       CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS
@@ -149,7 +149,7 @@ module Superenv
   end
 
   def determine_path
-    paths = [superbin]
+    paths = [Superenv.bin]
     if MacOS::Xcode.without_clt?
       paths << "#{MacOS::Xcode.prefix}/usr/bin"
       paths << "#{MacOS::Xcode.prefix}/Toolchains/XcodeDefault.xctoolchain/usr/bin"
-- 
cgit v1.2.3