diff options
| author | William Woodruff | 2015-07-26 16:49:16 -0400 |
|---|---|---|
| committer | Misty De Meo | 2015-08-21 11:02:33 -0700 |
| commit | 1face808f5f1dc43c887cab421b5c01f7e20fdf7 (patch) | |
| tree | 0d1308a216ba4b316470c84d3e02e7b09e752803 /Library/Homebrew/os/mac/xcode.rb | |
| parent | f58506ea6f7000e7e6d3f6538dc5ff2c43ea7926 (diff) | |
| download | brew-1face808f5f1dc43c887cab421b5c01f7e20fdf7.tar.bz2 | |
Add guards to calls that would trigger Xcode install requests
add guard in Formula#file_modified? to prevent git popup
add guard in Superenv.bin before calling MacOS::Xcode.version
add guard against missing Xcode/CLT in Xcode.uncached_version
return nil instread of 0 in uncached_version when Xcode/CLT are not present, to distinguish from linuxbrew behavior
checks against pour_bottle? and needs_relocation?, add guard around keg.relocate_install_names to check pour_bottle?/needs_relocation? as well
needs_relocation? becomes skip_relocation?, use cellar attr to indicate relocation instead of does_not_need_relocation
MacOS.can_build? becomes MacOS.has_apple_developer_tools?
Diffstat (limited to 'Library/Homebrew/os/mac/xcode.rb')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 83ba84ff8..40446a8ad 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -76,6 +76,8 @@ module OS return "0" unless OS.mac? + return nil if !MacOS::Xcode.installed? && !MacOS::CLT.installed? + %W[#{prefix}/usr/bin/xcodebuild #{which("xcodebuild")}].uniq.each do |path| if File.file? path Utils.popen_read(path, "-version") =~ /Xcode (\d(\.\d)*)/ |