admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

superenv: don't accidentally filter out HOMEBREW_TEMP

Browse Source 
Fixes Homebrew/homebrew#25471.
This commit is contained in:
Jack Nagel 2013-12-27 13:01:41 -06:00
parent ccc0eb98ba
commit b745d21912
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/ENV/4.3/cc
View File

@ -25,12 +25,13 @@ end
LOGGER = Logger.new LOGGER = Logger.new
class Cmd class Cmd
attr_reader :brewfix, :sdkroot attr_reader :brewfix, :brewtmp, :sdkroot
def initialize path, args def initialize path, args
@arg0 = File.basename(path).freeze @arg0 = File.basename(path).freeze
@args = args.freeze @args = args.freeze
@brewfix = ENV['HOMEBREW_PREFIX'] @brewfix = ENV['HOMEBREW_PREFIX']
@brewtmp = ENV['HOMEBREW_TEMP']
@sdkroot = ENV['HOMEBREW_SDKROOT'] @sdkroot = ENV['HOMEBREW_SDKROOT']
end end
def mode def mode
@ -137,7 +138,7 @@ class Cmd
when /^-L(.+)?/ when /^-L(.+)?/
path = $1.chuzzle || whittler.next path = $1.chuzzle || whittler.next
doit = case path.cleanpath 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 # maybe homebrew is installed to /sw or /opt/brew
true true
when %r{^/opt}, %r{^/sw}, %r{/usr/X11} when %r{^/opt}, %r{^/sw}, %r{/usr/X11}

1
Library/Homebrew/extend/ENV/super.rb
View File

@ -74,6 +74,7 @@ module Superenv
self['HOMEBREW_OPTIMIZATION_LEVEL'] = 'Os' self['HOMEBREW_OPTIMIZATION_LEVEL'] = 'Os'
self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE
self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX
self['HOMEBREW_TEMP'] = HOMEBREW_TEMP
self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt? 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_DEVELOPER_DIR'] = determine_developer_dir # used by our xcrun shim
self['HOMEBREW_VERBOSE'] = "1" if ARGV.verbose? self['HOMEBREW_VERBOSE'] = "1" if ARGV.verbose?