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

Get the basename and dirname once

Browse Source
This commit is contained in:
Jack Nagel 2015-02-12 19:13:03 -05:00
parent 988ec8de98
commit 28b926686b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/ENV/4.3/cc
View File

@ -29,8 +29,8 @@ class Cmd
attr_reader :config, :prefix, :cellar, :tmpdir, :sysroot attr_reader :config, :prefix, :cellar, :tmpdir, :sysroot
attr_reader :archflags, :optflags attr_reader :archflags, :optflags
def initialize path, args def initialize(arg0, args)
@arg0 = File.basename(path).freeze @arg0 = arg0
@args = args.freeze @args = args.freeze
@config = ENV.fetch("HOMEBREW_CCCFG") { "" } @config = ENV.fetch("HOMEBREW_CCCFG") { "" }
@prefix = ENV['HOMEBREW_PREFIX'] @prefix = ENV['HOMEBREW_PREFIX']
@ -332,14 +332,16 @@ if __FILE__ == $PROGRAM_NAME
####################################################################### main ####################################################################### main
LOGGER.puts "#{File.basename($0)} called with: #{ARGV.join(" ")}" dirname, basename = File.split($0)
cmd = Cmd.new($0, ARGV) LOGGER.puts "#{basename} called with: #{ARGV.join(" ")}"
cmd = Cmd.new(basename, ARGV)
tool, args = cmd.tool, cmd.args tool, args = cmd.tool, cmd.args
LOGGER.puts "superenv executed: #{tool} #{args.join(" ")}" LOGGER.puts "superenv executed: #{tool} #{args.join(" ")}"
LOGGER.log! LOGGER.log!
args << { :close_others => false } if RUBY_VERSION >= "2.0" args << { :close_others => false } if RUBY_VERSION >= "2.0"
exec "#{File.dirname($0)}/xcrun", tool, *args exec "#{dirname}/xcrun", tool, *args
end end