From ab5c6218b168048de7b4c4db123fe0fac9bda30e Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 19 Aug 2013 12:32:56 -0500 Subject: [PATCH] Move setup into an extended callback --- Library/Homebrew/superenv.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index bb32d0a299..dfaee93248 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -26,6 +26,11 @@ module Superenv attr_accessor :keg_only_deps, :deps, :x11 alias_method :x11?, :x11 + def self.extended(base) + base.keg_only_deps = [] + base.deps = [] + end + def reset %w{CC CXX OBJC OBJCXX CPP MAKE LD LDSHARED CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS @@ -311,8 +316,6 @@ if not superenv? ENV.prepend 'PATH', "#{HOMEBREW_PREFIX}/bin", ':' unless ORIGINAL_PATHS.include? HOMEBREW_PREFIX/'bin' else ENV.extend(Superenv) - ENV.keg_only_deps = [] - ENV.deps = [] end