diff options
| author | Jack Nagel | 2013-12-27 13:01:41 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-27 13:01:41 -0600 |
| commit | b745d219122c15214e0f765f0de7e11987a039c3 (patch) | |
| tree | ee096c522f08cf82a04c97ea6ffe6819243cf01b /Library | |
| parent | ccc0eb98ba2327c0a5f8b76b976538748d92dcc0 (diff) | |
| download | brew-b745d219122c15214e0f765f0de7e11987a039c3.tar.bz2 | |
superenv: don't accidentally filter out HOMEBREW_TEMP
Fixes Homebrew/homebrew#25471.
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/ENV/4.3/cc | 5 | ||||
| -rw-r--r-- | 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 6a9407d03..20c9cc9ae 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 1afc94a0d..df305d175 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? |