aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Sharpsteen2011-11-23 09:21:30 -0800
committerCharlie Sharpsteen2011-11-23 09:21:30 -0800
commitaf59bb9c79319b0c2e87e94c0ed9c6079cd09ec0 (patch)
tree968bb779548c859bf3a7aff856f8e48fb4c40681
parent235581ae291d5a024b3f6017e246ecdcfb48e604 (diff)
downloadhomebrew-af59bb9c79319b0c2e87e94c0ed9c6079cd09ec0.tar.bz2
SDL: Disable assembly when compiling with Clang
Should have been rolled into the last commit. Troll needs coffee badly.
-rw-r--r--Library/Formula/sdl.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/Library/Formula/sdl.rb b/Library/Formula/sdl.rb
index 151f58d1f..175f66bc1 100644
--- a/Library/Formula/sdl.rb
+++ b/Library/Formula/sdl.rb
@@ -13,8 +13,6 @@ class Sdl < Formula
inreplace files, '@prefix@', HOMEBREW_PREFIX
end
- fails_with_llvm :build => 2335 # 2335.15.0 to be exact
-
def install
Sdl.use_homebrew_prefix %w[sdl.pc.in sdl-config.in]
@@ -23,8 +21,8 @@ class Sdl < Formula
system "./autogen.sh" if ARGV.build_head?
args = %W[--prefix=#{prefix} --disable-nasm]
- # On Lion, LLVM-GCC chokes on the assembly code packaged with SDL.
- args << '--disable-assembly' if ENV.compiler == :llvm and MacOS.lion?
+ # LLVM-based compilers choke on the assembly code packaged with SDL.
+ args << '--disable-assembly' if ENV.compiler == :llvm or ENV.compiler == :clang
system './configure', *args
system "make install"