diff options
| author | Max Howell | 2011-09-06 17:51:14 +0100 |
|---|---|---|
| committer | Max Howell | 2011-09-06 17:51:23 +0100 |
| commit | d37918b20fe94216b2b804e9bdfc47c5dc1f5ad9 (patch) | |
| tree | 14b8ffc89288f42a0ec1a993b6258243cf3ab019 | |
| parent | 5dc302604f44fe5fbfb3efef1e7af1a21411e21f (diff) | |
| download | brew-d37918b20fe94216b2b804e9bdfc47c5dc1f5ad9.tar.bz2 | |
If LLVM isn't installed then fails_with_llvm? is true
This makes sense, I assure you. Fixes Homebrew/homebrew#7458.
| -rw-r--r-- | Library/Homebrew/formula.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/utils.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 5f43c97da..ed0172219 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -231,7 +231,7 @@ class Formula def fails_with_llvm? llvm = self.class.fails_with_llvm_reason if llvm - if llvm.build and MacOS.llvm_build_version > llvm.build.to_i + if llvm.build and MacOS.llvm_build_version.to_i > llvm.build.to_i false else llvm diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index cd3a5fa49..5ce54e6fc 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -329,7 +329,7 @@ module MacOS extend self def llvm_build_version # for Xcode 3 on OS X 10.5 this will not exist # NOTE may not be true anymore but we can't test - if File.exist? "/usr/bin/llvm-gcc" + @llvm_build_version ||= if File.exist? "/usr/bin/llvm-gcc" `/usr/bin/llvm-gcc -v 2>&1` =~ /LLVM build (\d{4,})/ $1.to_i end |