diff options
| author | Martin Afanasjew | 2016-01-20 05:46:23 +0100 |
|---|---|---|
| committer | Martin Afanasjew | 2016-01-20 10:23:21 +0100 |
| commit | 026363e1edff723217d72d9ac0d38f699d9ed850 (patch) | |
| tree | 4ded39fb82aee636d9cef2821007c4070ab60718 /Library/Homebrew | |
| parent | 4ffe25adc8a3e71706a81e06f2b83aab37765dc2 (diff) | |
| download | brew-026363e1edff723217d72d9ac0d38f699d9ed850.tar.bz2 | |
diagnostic: fix autoconf check
Xcode can only provide autotools if it is installed, thus check that
first. Skipping this check will try to compare a `nil` Xcode version to
4.3, the first version of Xcode to not provide autotools.
Fixes Homebrew/homebrew#48208.
Closes Homebrew/homebrew#48278.
Signed-off-by: Martin Afanasjew <martin@afanasjew.de>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/diagnostic.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_diagnostic.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 6b8330f23..0743c6e03 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -1044,6 +1044,7 @@ module Homebrew end def check_for_autoconf + return unless MacOS::Xcode.installed? return unless MacOS::Xcode.provides_autotools? autoconf = which("autoconf") diff --git a/Library/Homebrew/test/test_diagnostic.rb b/Library/Homebrew/test/test_diagnostic.rb index 8aa2c6f67..07bae8329 100644 --- a/Library/Homebrew/test/test_diagnostic.rb +++ b/Library/Homebrew/test/test_diagnostic.rb @@ -205,6 +205,7 @@ class DiagnosticChecksTest < Homebrew::TestCase end def test_check_for_autoconf + MacOS::Xcode.stubs(:installed?).returns true MacOS::Xcode.stubs(:provides_autotools?).returns true mktmpdir do |path| file = "#{path}/autoconf" |