From d37918b20fe94216b2b804e9bdfc47c5dc1f5ad9 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Tue, 6 Sep 2011 17:51:14 +0100 Subject: [PATCH] If LLVM isn't installed then fails_with_llvm? is true This makes sense, I assure you. Fixes Homebrew/homebrew#7458. --- Library/Homebrew/formula.rb | 2 +- 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 5f43c97daa..ed01722192 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 cd3a5fa49c..5ce54e6fcd 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