diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 62703ee42f..9f8e8c6896 100755 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -66,9 +66,7 @@ def install f if ARGV.verbose? ohai "Build Environment" - %w[PATH CFLAGS LDFLAGS CPPFLAGS MAKEFLAGS CC CXX MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH].each do |env| - puts "#{env}: #{ENV[env]}" unless ENV[env].to_s.empty? - end + dump_build_env ENV end build_time = nil diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 57f28f101a..700b0acf18 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -213,3 +213,12 @@ def nostdout end end end + +def dump_build_env env + puts "\"--use-llvm\" was specified" if ARGV.include? '--use-llvm' + + %w[CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET MAKEFLAGS PATH PKG_CONFIG_PATH HOMEBREW_USE_LLVM].each do |k| + value = env[k] + puts "#{k}: #{value}" if value + end +end \ No newline at end of file diff --git a/bin/brew b/bin/brew index abdfd43dfa..092fe55988 100755 --- a/bin/brew +++ b/bin/brew @@ -69,15 +69,6 @@ PATH: #{ENV['PATH']} EOS end -def dump_build_env env - puts "\"--use-llvm\" was specified" if ARGV.include? '--use-llvm' - - %w[CC CXX LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MAKEFLAGS PATH PKG_CONFIG_PATH HOMEBREW_USE_LLVM].each do |k| - value = env[k] - puts "#{k}: #{value}" if value - end -end - begin require 'brew.h'