aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2015-06-17 22:03:50 -0400
committerJack Nagel2015-06-18 23:13:48 -0400
commit7edf3c88f635475dee72319720a05ae8ab8deede (patch)
tree705133f52ee244327d91e07b280217fc1807be7e /Library/Homebrew/cmd
parentbd42901fa7146729395706e019b3bc2e445e4b7c (diff)
downloadbrew-7edf3c88f635475dee72319720a05ae8ab8deede.tar.bz2
Pass formula objects, not strings, into the build environment
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/--env.rb2
-rw-r--r--Library/Homebrew/cmd/sh.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb
index 803654635..fb6163d81 100644
--- a/Library/Homebrew/cmd/--env.rb
+++ b/Library/Homebrew/cmd/--env.rb
@@ -3,7 +3,7 @@ require "extend/ENV"
module Homebrew
def __env
ENV.activate_extensions!
- ENV.deps = ARGV.formulae.map(&:name) if superenv?
+ ENV.deps = ARGV.formulae if superenv?
ENV.setup_build_environment
ENV.universal_binary if ARGV.build_universal?
diff --git a/Library/Homebrew/cmd/sh.rb b/Library/Homebrew/cmd/sh.rb
index 65c5c2b0d..e48313a77 100644
--- a/Library/Homebrew/cmd/sh.rb
+++ b/Library/Homebrew/cmd/sh.rb
@@ -7,7 +7,7 @@ module Homebrew
if superenv?
ENV.x11 = MacOS::X11.installed?
- ENV.deps = Formula.installed.select{|f| f.keg_only? and f.opt_prefix.directory? }.map(&:name)
+ ENV.deps = Formula.installed.select { |f| f.keg_only? && f.opt_prefix.directory? }
end
ENV.setup_build_environment
if superenv?