Display only HOMEBREW_CC/CXX in brew --env under superenv

The other values will be identical.
This commit is contained in:
Jack Nagel 2013-11-07 14:35:56 -06:00
parent 8484e72f75
commit 17b59fcee0

View File

@ -23,8 +23,8 @@ module Homebrew extend self
def build_env_keys env def build_env_keys env
%w[ %w[
CC CXX LD CC CXX LD OBJC OBJCXX
HOMEBREW_CC HOMEBREW_CC HOMEBREW_CXX
CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT MAKEFLAGS CFLAGS CXXFLAGS CPPFLAGS LDFLAGS SDKROOT MAKEFLAGS
CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_LIBRARY_PATH CMAKE_FRAMEWORK_PATH CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_LIBRARY_PATH CMAKE_FRAMEWORK_PATH
MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH PKG_CONFIG_LIBDIR MACOSX_DEPLOYMENT_TARGET PKG_CONFIG_PATH PKG_CONFIG_LIBDIR
@ -32,14 +32,12 @@ module Homebrew extend self
HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT
HOMEBREW_SDKROOT HOMEBREW_BUILD_FROM_SOURCE HOMEBREW_SDKROOT HOMEBREW_BUILD_FROM_SOURCE
MAKE GIT CPP MAKE GIT CPP
ACLOCAL_PATH OBJC PATH CPATH].select{ |key| env.fetch(key) if env.key? key } ACLOCAL_PATH PATH CPATH].select{ |key| env.fetch(key) if env.key? key }
end end
def dump_build_env env def dump_build_env env
build_env_keys(env).each do |key| build_env_keys(env).each do |key|
case key when 'CC', 'CXX' next if superenv? and %w{CC CXX OBJC OBJCXX}.include? key
next
end if superenv?
value = env[key] value = env[key]
print "#{key}: #{value}" print "#{key}: #{value}"