admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Process requirements before keg-only deps under stdenv

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-09-02 14:37:15 -05:00
parent b49fa78f96
commit b97c0919f8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/build.rb
View File

@ -86,7 +86,12 @@ def install f
pre_superenv_hacks(f) pre_superenv_hacks(f)
require 'superenv' require 'superenv'
ENV.setup_build_environment unless superenv? unless superenv?
ENV.setup_build_environment
# Requirements are processed first so that adjustments made to ENV
# for keg-only deps take precdence.
f.recursive_requirements.each { |rq| rq.modify_build_environment }
end
keg_only_deps.each do |dep| keg_only_deps.each do |dep|
opt = HOMEBREW_PREFIX/:opt/dep.name opt = HOMEBREW_PREFIX/:opt/dep.name
@ -106,10 +111,9 @@ def install f
ENV.deps = keg_only_deps.map(&:to_s) ENV.deps = keg_only_deps.map(&:to_s)
ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency } ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency }
ENV.setup_build_environment ENV.setup_build_environment
f.recursive_requirements.each { |rq| rq.modify_build_environment }
end end
f.recursive_requirements.each { |req| req.modify_build_environment }
if f.fails_with? ENV.compiler if f.fails_with? ENV.compiler
cs = CompilerSelector.new f cs = CompilerSelector.new f
cs.select_compiler cs.select_compiler