From de9ce5641498f33cafff0eabbd8f22687e0f5b91 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 21 Apr 2014 00:17:22 -0500 Subject: [PATCH] Make obvious that what we care about is the presence of sdkroot --- Library/ENV/4.3/cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc index a774fa9fda..841376f1da 100755 --- a/Library/ENV/4.3/cc +++ b/Library/ENV/4.3/cc @@ -86,7 +86,7 @@ class Cmd args = refurbished_args end - if nclt? + if sdkroot if tool != 'ld' args << "--sysroot=#{sdkroot}" else @@ -208,7 +208,7 @@ class Cmd args end def syspath - if nclt? + if sdkroot %W{#{sdkroot}/usr #{sdkroot}/usr/local} else %W{/usr /usr/local} @@ -269,9 +269,6 @@ class Cmd # configure scripts generated with autoconf 2.61 or later export as_nl ENV.key? 'as_nl' end - def nclt? - sdkroot != nil - end def cccfg? flags flags.split('').all?{|c| ENV['HOMEBREW_CCCFG'].include? c } if ENV['HOMEBREW_CCCFG'] end