diff options
| author | Max Howell | 2011-09-01 10:29:31 +0100 |
|---|---|---|
| committer | Max Howell | 2011-09-01 10:29:31 +0100 |
| commit | fbb811b9483ca16142e17687427e0bdeb43d467c (patch) | |
| tree | 2d55fe796d707f00e6cc9f1dcc4a10cd8625919a | |
| parent | aacd0bed58d16fd6fd5d3f2f71fb5a3fae6f3d3c (diff) | |
| download | homebrew-fbb811b9483ca16142e17687427e0bdeb43d467c.tar.bz2 | |
Allow fails_with_llvm {}
And fix node and ruby to use LLVM without complaint with Xcode 4.1 and Lion.
| -rw-r--r-- | Library/Formula/node.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/ruby.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Library/Formula/node.rb b/Library/Formula/node.rb index a92022f7c..8784556ab 100644 --- a/Library/Formula/node.rb +++ b/Library/Formula/node.rb @@ -9,7 +9,7 @@ class Node < Formula # Leopard OpenSSL is not new enough, so use our keg-only one depends_on 'openssl' if MacOS.leopard? - fails_with_llvm + fails_with_llvm :build => 2326 if MacOS.lion? # Stripping breaks dynamic loading skip_clean :all diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb index 5f8e0b49f..2f8f9b2ee 100644 --- a/Library/Formula/ruby.rb +++ b/Library/Formula/ruby.rb @@ -9,7 +9,7 @@ class Ruby < Formula depends_on 'readline' depends_on 'libyaml' - fails_with_llvm + fails_with_llvm :build => 2326 if MacOS.lion? # Stripping breaks dynamic linking skip_clean :all diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 7033a1e51..ca7885983 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -76,7 +76,12 @@ class FailsWithLLVM attr_reader :msg, :data, :build def initialize msg=nil, data=nil - @msg = msg || "(No specific reason was given)" + if msg.nil? or msg.kind_of? Hash + @msg = "(No specific reason was given)" + data = msg + else + @msg = msg + end @data = data @build = data.delete :build rescue nil end |