Make obvious that what we care about is the presence of sdkroot

This commit is contained in:
Jack Nagel 2014-04-21 00:17:22 -05:00
parent 8b086fe575
commit de9ce56414

View File

@ -86,7 +86,7 @@ class Cmd
args = refurbished_args args = refurbished_args
end end
if nclt? if sdkroot
if tool != 'ld' if tool != 'ld'
args << "--sysroot=#{sdkroot}" args << "--sysroot=#{sdkroot}"
else else
@ -208,7 +208,7 @@ class Cmd
args args
end end
def syspath def syspath
if nclt? if sdkroot
%W{#{sdkroot}/usr #{sdkroot}/usr/local} %W{#{sdkroot}/usr #{sdkroot}/usr/local}
else else
%W{/usr /usr/local} %W{/usr /usr/local}
@ -269,9 +269,6 @@ 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 def cccfg? flags
flags.split('').all?{|c| ENV['HOMEBREW_CCCFG'].include? c } if ENV['HOMEBREW_CCCFG'] flags.split('').all?{|c| ENV['HOMEBREW_CCCFG'].include? c } if ENV['HOMEBREW_CCCFG']
end end