From 73d0ee43586018ac9ddab884e3e7faffbf6e7fa1 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 15 Oct 2009 09:08:26 +0100 Subject: [PATCH] Move verbose ARGV display to install.rb This works better as it comes after any keg-only deps change ENV, but also it needs to happen after brewkit is required and that only happens in install now. --- Library/Homebrew/install.rb | 7 +++++++ bin/brew | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 9509a56b8e..d9b66d5acd 100755 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -51,6 +51,13 @@ def install f end end + if ARGV.verbose? + ohai "Build Environment" + %w[PATH CFLAGS LDFLAGS CPPFLAGS MAKEFLAGS CC CXX MACOSX_DEPLOYMENT_TARGET].each do |f| + puts "#{f}: #{ENV[f]}" unless ENV[f].to_s.empty? + end + end + build_time = nil begin f.brew do diff --git a/bin/brew b/bin/brew index f2a3d5ff09..d263fd6cad 100755 --- a/bin/brew +++ b/bin/brew @@ -101,13 +101,6 @@ begin raise "Interactive mode can only be used with one formula argument" end - if ARGV.verbose? - ohai "Build Environment" - %w[PATH CFLAGS LDFLAGS CPPFLAGS MAKEFLAGS CC CXX MACOSX_DEPLOYMENT_TARGET].each do |f| - puts "#{f}: #{ENV[f]}" unless ENV[f].to_s.empty? - end - end - warn_about_macports_or_fink # keep warning before dependency resolution unless ARGV.force?