From b745d219122c15214e0f765f0de7e11987a039c3 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 27 Dec 2013 13:01:41 -0600 Subject: [PATCH] superenv: don't accidentally filter out HOMEBREW_TEMP Fixes Homebrew/homebrew#25471. --- Library/ENV/4.3/cc | 5 +++-- Library/Homebrew/extend/ENV/super.rb | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc index 6a9407d037..20c9cc9ae5 100755 --- a/Library/ENV/4.3/cc +++ b/Library/ENV/4.3/cc @@ -25,12 +25,13 @@ end LOGGER = Logger.new class Cmd - attr_reader :brewfix, :sdkroot + attr_reader :brewfix, :brewtmp, :sdkroot def initialize path, args @arg0 = File.basename(path).freeze @args = args.freeze @brewfix = ENV['HOMEBREW_PREFIX'] + @brewtmp = ENV['HOMEBREW_TEMP'] @sdkroot = ENV['HOMEBREW_SDKROOT'] end def mode @@ -137,7 +138,7 @@ class Cmd when /^-L(.+)?/ path = $1.chuzzle || whittler.next doit = case path.cleanpath - when %r{^#{Regexp.escape(brewfix)}} + when %r{^#{Regexp.escape(brewfix)}}, %r{^#{Regexp.escape(brewtmp)}} # maybe homebrew is installed to /sw or /opt/brew true when %r{^/opt}, %r{^/sw}, %r{/usr/X11} diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 1afc94a0db..df305d1753 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -74,6 +74,7 @@ module Superenv self['HOMEBREW_OPTIMIZATION_LEVEL'] = 'Os' self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX + self['HOMEBREW_TEMP'] = HOMEBREW_TEMP self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt? self['HOMEBREW_DEVELOPER_DIR'] = determine_developer_dir # used by our xcrun shim self['HOMEBREW_VERBOSE'] = "1" if ARGV.verbose?