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/extend | |
| 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/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 2 | 
2 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 6798e6cd3..d05ccf1a3 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -29,7 +29,7 @@ module Stdenv      self["PKG_CONFIG_LIBDIR"] = determine_pkg_config_libdir      # make any aclocal stuff installed in Homebrew available -    self["ACLOCAL_PATH"] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS::Xcode.provides_autotools? +    self["ACLOCAL_PATH"] = "#{HOMEBREW_PREFIX}/share/aclocal" if MacOS.has_apple_developer_tools? && MacOS::Xcode.provides_autotools?      self["MAKEFLAGS"] = "-j#{make_jobs}" diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 911602919..bcfcd2f0f 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -23,6 +23,8 @@ module Superenv    end    def self.bin +    return unless MacOS.has_apple_developer_tools? +      bin = (HOMEBREW_REPOSITORY/"Library/ENV").subdirs.reject { |d| d.basename.to_s > MacOS::Xcode.version }.max      bin.realpath unless bin.nil?    end  | 
