build: expand requirements recursively when modifying ENV
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
parent
120ce10730
commit
53cf970312
@ -56,7 +56,7 @@ at_exit do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def install f
|
def install f
|
||||||
f.requirements.each { |dep| dep.modify_build_environment }
|
f.recursive_requirements.each { |req| req.modify_build_environment }
|
||||||
|
|
||||||
f.recursive_deps.uniq.each do |dep|
|
f.recursive_deps.uniq.each do |dep|
|
||||||
dep = Formula.factory dep
|
dep = Formula.factory dep
|
||||||
|
@ -440,6 +440,12 @@ class Formula
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def recursive_requirements
|
||||||
|
reqs = recursive_deps.map { |dep| dep.requirements }.to_set
|
||||||
|
reqs << requirements
|
||||||
|
reqs.flatten
|
||||||
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
# Pretty titles the command and buffers stdout/stderr
|
# Pretty titles the command and buffers stdout/stderr
|
||||||
|
Loading…
x
Reference in New Issue
Block a user