From a358bee8e2ae3823dae03cd54bf1edd0d32cefe6 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 23 Dec 2012 19:43:10 -0600
Subject: Clean up BuildEnvironment interface a bit

---
 Library/Homebrew/formula.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Library/Homebrew/formula.rb')

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 337916a0a..3d3c23ec3 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -437,7 +437,7 @@ class Formula
   def requirements; self.class.dependencies.requirements; end
 
   def env
-    @env ||= BuildEnvironment.new(self.class.environments)
+    @env ||= self.class.env
   end
 
   def conflicts
@@ -710,12 +710,10 @@ private
       @stable.mirror(val)
     end
 
-    def environments
-      @environments ||= []
-    end
-
     def env *settings
-      environments.concat [settings].flatten
+      @env ||= BuildEnvironment.new
+      settings.each { |s| @env << s }
+      @env
     end
 
     def dependencies
-- 
cgit v1.2.3