aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Howell2009-10-15 09:08:26 +0100
committerMax Howell2009-10-15 16:48:07 +0100
commit73d0ee43586018ac9ddab884e3e7faffbf6e7fa1 (patch)
treea29ddc31a8a4ea100e9555f31fcbf916bc7cfec6
parentca1a6492bc7921c3ad269f434be5b927802ada64 (diff)
downloadbrew-73d0ee43586018ac9ddab884e3e7faffbf6e7fa1.tar.bz2
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.
-rwxr-xr-xLibrary/Homebrew/install.rb7
-rwxr-xr-xbin/brew7
2 files changed, 7 insertions, 7 deletions
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 9509a56b8..d9b66d5ac 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 f2a3d5ff0..d263fd6ca 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?