Restore previous style
This commit is contained in:
parent
d35f2e76a7
commit
88a69b3de2
@ -78,8 +78,13 @@ class Build
|
|||||||
ENV.keg_only_deps = keg_only_deps
|
ENV.keg_only_deps = keg_only_deps
|
||||||
ENV.deps = formula_deps
|
ENV.deps = formula_deps
|
||||||
ENV.run_time_deps = run_time_deps
|
ENV.run_time_deps = run_time_deps
|
||||||
ENV.setup_build_environment(formula: formula, cc: args.cc, build_bottle: args.build_bottle?,
|
ENV.setup_build_environment(
|
||||||
bottle_arch: args.bottle_arch, debug_symbols: args.debug_symbols?)
|
formula: formula,
|
||||||
|
cc: args.cc,
|
||||||
|
build_bottle: args.build_bottle?,
|
||||||
|
bottle_arch: args.bottle_arch,
|
||||||
|
debug_symbols: args.debug_symbols?,
|
||||||
|
)
|
||||||
reqs.each do |req|
|
reqs.each do |req|
|
||||||
req.modify_build_environment(
|
req.modify_build_environment(
|
||||||
env: args.env, cc: args.cc, build_bottle: args.build_bottle?, bottle_arch: args.bottle_arch,
|
env: args.env, cc: args.cc, build_bottle: args.build_bottle?, bottle_arch: args.bottle_arch,
|
||||||
@ -87,8 +92,13 @@ class Build
|
|||||||
end
|
end
|
||||||
deps.each(&:modify_build_environment)
|
deps.each(&:modify_build_environment)
|
||||||
else
|
else
|
||||||
ENV.setup_build_environment(formula: formula, cc: args.cc, build_bottle: args.build_bottle?,
|
ENV.setup_build_environment(
|
||||||
bottle_arch: args.bottle_arch, debug_symbols: args.debug_symbols?)
|
formula: formula,
|
||||||
|
cc: args.cc,
|
||||||
|
build_bottle: args.build_bottle?,
|
||||||
|
bottle_arch: args.bottle_arch,
|
||||||
|
debug_symbols: args.debug_symbols?,
|
||||||
|
)
|
||||||
reqs.each do |req|
|
reqs.each do |req|
|
||||||
req.modify_build_environment(
|
req.modify_build_environment(
|
||||||
env: args.env, cc: args.cc, build_bottle: args.build_bottle?, bottle_arch: args.bottle_arch,
|
env: args.env, cc: args.cc, build_bottle: args.build_bottle?, bottle_arch: args.bottle_arch,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user