aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-11-07 14:35:56 -0600
committerJack Nagel2013-11-07 14:38:43 -0600
commit5f8e1504ab2fd8078ec25e32f58e552a873893f5 (patch)
tree4db136f54d2d7ea8b4c265f595e9ea298de74a0b /Library
parentd0937963bc85a5ba0d331dda518f1cb8d960bb6b (diff)
downloadhomebrew-5f8e1504ab2fd8078ec25e32f58e552a873893f5.tar.bz2
Display only HOMEBREW_CC/CXX in `brew --env` under superenv
The other values will be identical.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/--env.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb
index f4d25ae2f..b73ae0abb 100644
--- a/Library/Homebrew/cmd/--env.rb
+++ b/Library/Homebrew/cmd/--env.rb
@@ -23,8 +23,8 @@ module Homebrew extend self
def build_env_keys env
%w[
- CC CXX LD
- HOMEBREW_CC
+ 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
@@ -32,14 +32,12 @@ module Homebrew extend self
HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT
HOMEBREW_SDKROOT HOMEBREW_BUILD_FROM_SOURCE
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
def dump_build_env env
build_env_keys(env).each do |key|
- case key when 'CC', 'CXX'
- next
- end if superenv?
+ next if superenv? and %w{CC CXX OBJC OBJCXX}.include? key
value = env[key]
print "#{key}: #{value}"