diff options
| author | Jack Nagel | 2014-07-02 21:24:01 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-02 21:27:19 -0500 |
| commit | dfbe4fe01b96e047d2140ae683ab7fb8f25e5b79 (patch) | |
| tree | efc85e9d591af374513e6107525b2ce04f02f054 | |
| parent | 8c68a14e9f09bae37c9db86e86815b2c1708e890 (diff) | |
| download | homebrew-dfbe4fe01b96e047d2140ae683ab7fb8f25e5b79.tar.bz2 | |
Move require into method to avoid circular require
There is a nasty circular dependency here:
formula.rb
requirement.rb
extend/ENV.rb
extend/ENV/shared.rb
formula.rb
Probably the information that the build environment needs from formula
should be passed in at runtime, but that seems hard and I really just
want to be able to run the tests with warnings turned on. :/
| -rw-r--r-- | Library/Homebrew/requirement.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index ee9b127ab..e05f98a46 100644 --- a/Library/Homebrew/requirement.rb +++ b/Library/Homebrew/requirement.rb @@ -1,7 +1,6 @@ require 'dependable' require 'dependency' require 'build_environment' -require 'extend/ENV' # A base class for non-formula requirements needed by formulae. # A "fatal" requirement is one that will fail the build if it is not present. @@ -127,6 +126,7 @@ class Requirement if instance_variable_defined?(:@satisfied) @satisfied elsif @options[:build_env] + require "extend/ENV" ENV.with_build_environment { yield @proc } else yield @proc |