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

Move some global methods into the context in which they used

Browse Source
This commit is contained in:
Jack Nagel 2013-11-21 14:50:35 -06:00
parent a40a0e1862
commit ce5f4ad4df
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/ENV/4.3/cc
View File

@ -24,20 +24,6 @@ end
LOGGER = Logger.new LOGGER = Logger.new
def cccfg? flags
flags.split('').all?{|c| ENV['HOMEBREW_CCCFG'].include? c } if ENV['HOMEBREW_CCCFG']
end
def nclt?
$sdkroot != nil
end
def syspath
if nclt?
%W{#$sdkroot/usr #$sdkroot/usr/local}
else
%W{/usr /usr/local}
end
end
class Cmd class Cmd
def initialize path, args def initialize path, args
@arg0 = File.basename(path).freeze @arg0 = File.basename(path).freeze
@ -192,6 +178,13 @@ class Cmd
args.concat ENV['HOMEBREW_ARCHFLAGS'].split(' ') if cccfg? 'u' args.concat ENV['HOMEBREW_ARCHFLAGS'].split(' ') if cccfg? 'u'
args args
end end
def syspath
if nclt?
%W{#$sdkroot/usr #$sdkroot/usr/local}
else
%W{/usr /usr/local}
end
end
def syslibpath def syslibpath
# We reject brew's lib as we explicitly add this as a -L flag, thus it # We reject brew's lib as we explicitly add this as a -L flag, thus it
# is given higher priority by cc, so it surpasses the system libpath. # is given higher priority by cc, so it surpasses the system libpath.
@ -249,6 +242,12 @@ class Cmd
# configure scripts generated with autoconf 2.61 or later export as_nl # configure scripts generated with autoconf 2.61 or later export as_nl
ENV.key? 'as_nl' ENV.key? 'as_nl'
end end
def nclt?
$sdkroot != nil
end
def cccfg? flags
flags.split('').all?{|c| ENV['HOMEBREW_CCCFG'].include? c } if ENV['HOMEBREW_CCCFG']
end
end end
if __FILE__ == $PROGRAM_NAME if __FILE__ == $PROGRAM_NAME