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

Fix up dep directories before activating ENV extensions

Browse Source
This commit is contained in:
Jack Nagel 2014-07-28 23:05:44 -05:00
parent 8a971f7268
commit 8ca8ec3993
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/build.rb
View File

@ -113,15 +113,14 @@ class Build
def install def install
keg_only_deps = deps.map(&:to_formula).select(&:keg_only?) keg_only_deps = deps.map(&:to_formula).select(&:keg_only?)
pre_superenv_hacks
ENV.activate_extensions!
deps.map(&:to_formula).each do |dep| deps.map(&:to_formula).each do |dep|
opt = HOMEBREW_PREFIX.join("opt", dep.name) opt = HOMEBREW_PREFIX.join("opt", dep.name)
fixopt(dep) unless opt.directory? fixopt(dep) unless opt.directory?
end end
pre_superenv_hacks
ENV.activate_extensions!
if superenv? if superenv?
ENV.keg_only_deps = keg_only_deps.map(&:name) ENV.keg_only_deps = keg_only_deps.map(&:name)
ENV.deps = deps.map { |d| d.to_formula.name } ENV.deps = deps.map { |d| d.to_formula.name }