diff options
| author | Baptiste Fontaine | 2015-11-13 16:43:43 +0100 | 
|---|---|---|
| committer | Baptiste Fontaine | 2015-11-17 00:17:22 +0100 | 
| commit | 24a1eeceb3fa5a90db58898340ad20132e0c9514 (patch) | |
| tree | 8e1d9c7e4616f8e8cc78938fe9b8fe2640a56d2c /Library/Homebrew/cmd | |
| parent | c55080abd52aa03adee48305ae6c6db4dfbe130c (diff) | |
| download | brew-24a1eeceb3fa5a90db58898340ad20132e0c9514.tar.bz2 | |
Common build environment methods moved in build_environment.rb
Closes Homebrew/homebrew#45966.
Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/--env.rb | 30 | 
1 files changed, 1 insertions, 29 deletions
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb index eba497253..4ecf7e643 100644 --- a/Library/Homebrew/cmd/--env.rb +++ b/Library/Homebrew/cmd/--env.rb @@ -1,4 +1,5 @@  require "extend/ENV" +require "build_environment"  module Homebrew    def __env @@ -15,33 +16,4 @@ module Homebrew        end      end    end - -  def build_env_keys(env) -    %w[ -      CC CXX LD OBJC OBJCXX -      HOMEBREW_CC HOMEBREW_CXX -      CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT MAKEFLAGS -      CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_LIBRARY_PATH CMAKE_FRAMEWORK_PATH -      MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -      HOMEBREW_DEBUG HOMEBREW_MAKE_JOBS HOMEBREW_VERBOSE -      HOMEBREW_SVN HOMEBREW_GIT -      HOMEBREW_SDKROOT HOMEBREW_BUILD_FROM_SOURCE -      MAKE GIT CPP -      ACLOCAL_PATH PATH CPATH].select { |key| env.key?(key) } -  end - -  def dump_build_env(env, f = $stdout) -    keys = build_env_keys(env) -    keys -= %w[CC CXX OBJC OBJCXX] if env["CC"] == env["HOMEBREW_CC"] - -    keys.each do |key| -      value = env[key] -      s = "#{key}: #{value}" -      case key -      when "CC", "CXX", "LD" -        s << " => #{Pathname.new(value).realpath}" if File.symlink?(value) -      end -      f.puts s -    end -  end  end  | 
