From 7edf3c88f635475dee72319720a05ae8ab8deede Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 17 Jun 2015 22:03:50 -0400 Subject: Pass formula objects, not strings, into the build environment --- Library/Homebrew/cmd/--env.rb | 2 +- Library/Homebrew/cmd/sh.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew/cmd') 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? -- cgit v1.2.3