aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/utils.rb
diff options
context:
space:
mode:
authorMax Howell2012-02-17 13:08:46 +0000
committerMax Howell2012-02-17 13:08:56 +0000
commit30cbb25147416620ff64e6ba6d047d5304dff25b (patch)
treee4791783891bc8b4ccb39c7e0652dc955e02d0fd /Library/Homebrew/utils.rb
parentba61d3013a9fa50e0af1f0c9fa508582fa55e740 (diff)
downloadbrew-30cbb25147416620ff64e6ba6d047d5304dff25b.tar.bz2
Fix some default_cc behavior
Fixes Homebrew/homebrew#10245. Fixes Homebrew/homebrew#10248.
Diffstat (limited to 'Library/Homebrew/utils.rb')
-rw-r--r--Library/Homebrew/utils.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index bc0f570d9..b552a4121 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -269,7 +269,7 @@ module MacOS extend self
def default_cc
cc = `/usr/bin/xcrun -find cc 2> /dev/null`.chomp
cc = "#{dev_tools_path}/cc" if cc.empty?
- Pathname.new(cc).realpath.basename.to_s
+ Pathname.new(cc).realpath.basename.to_s rescue nil
end
def default_compiler
@@ -304,10 +304,9 @@ module MacOS extend self
end
end
- # usually /Developer
def xcode_prefix
@xcode_prefix ||= begin
- path = `/usr/bin/xcode-select -print-path 2>&1`.chomp
+ path = `/usr/bin/xcode-select -print-path 2>/dev/null`.chomp
path = Pathname.new path
if path.directory? and path.absolute?
path