diff options
| author | Jack Nagel | 2012-07-12 03:10:57 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-07-25 12:04:42 -0500 |
| commit | 6d528e94bbde27a9f9a99ca46b9bedf6bdb3e8cd (patch) | |
| tree | d3c6430dac4451295d86e569bf3d61fabc84d2b4 /Library/Homebrew/macos.rb | |
| parent | a18f853679fd7755b280f99bd8cbb86ef9e9ca54 (diff) | |
| download | homebrew-6d528e94bbde27a9f9a99ca46b9bedf6bdb3e8cd.tar.bz2 | |
Rename xctools_fucked?
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/macos.rb')
| -rw-r--r-- | Library/Homebrew/macos.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb index 5a1302a9d..21c3bc7af 100644 --- a/Library/Homebrew/macos.rb +++ b/Library/Homebrew/macos.rb @@ -36,7 +36,7 @@ module MacOS extend self else # Xcrun was provided first with Xcode 4.3 and allows us to proxy # tool usage thus avoiding various bugs. - p = `/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp unless Xcode.xctools_fucked? + p = `/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp unless Xcode.bad_xcode_select_path? if !p.nil? and !p.empty? and File.executable? p path = Pathname.new p else @@ -67,7 +67,7 @@ module MacOS extend self @dev_tools_path ||= if File.exist? "/usr/bin/cc" and File.exist? "/usr/bin/make" # probably a safe enough assumption (the unix way) Pathname.new "/usr/bin" - elsif not Xcode.xctools_fucked? and system "/usr/bin/xcrun -find make 1>/dev/null 2>&1" + elsif not Xcode.bad_xcode_select_path? and system "/usr/bin/xcrun -find make 1>/dev/null 2>&1" # Wherever "make" is there are the dev tools. Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname elsif File.exist? "#{Xcode.prefix}/usr/bin/make" @@ -93,7 +93,7 @@ module MacOS extend self def sdk_path v=version @sdk_path ||= begin - path = if not Xcode.xctools_fucked? and File.executable? "#{Xcode.folder}/usr/bin/make" + path = if not Xcode.bad_xcode_select_path? and File.executable? "#{Xcode.folder}/usr/bin/make" `#{locate('xcodebuild')} -version -sdk macosx#{v} Path 2>/dev/null`.strip elsif File.directory? '/Developer/SDKs/MacOS#{v}.sdk' # the old default (or wild wild west style) |