Move extra stdenv setup to extended callback

1 files changed, 6 insertions, 1 deletions

diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 5e35bace5..64da1939a 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -14,7 +14,6 @@ module EnvActivation
       extend(Superenv)
     else
       extend(HomebrewEnvExtension)
-      prepend 'PATH', "#{HOMEBREW_PREFIX}/bin", ':' unless ORIGINAL_PATHS.include? HOMEBREW_PREFIX/'bin'
     end
   end
 end
@@ -27,6 +26,12 @@ module HomebrewEnvExtension
   FC_FLAG_VARS = %w{FCFLAGS FFLAGS}
   DEFAULT_FLAGS = '-march=core2 -msse4'
 
+  def self.extended(base)
+    unless ORIGINAL_PATHS.include? HOMEBREW_PREFIX/'bin'
+      base.prepend_path 'PATH', "#{HOMEBREW_PREFIX}/bin"
+    end
+  end
+
   def setup_build_environment
     # Clear CDPATH to avoid make issues that depend on changing directories
     delete('CDPATH')