From 08b4738bcdbd4f75801e270fabe6601763515a9b Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Fri, 16 May 2014 21:46:12 -0500
Subject: libvpx: simplify configure fix

---
 Library/Formula/libvpx.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/libvpx.rb b/Library/Formula/libvpx.rb
index b8910ca6b..ce71d2161 100644
--- a/Library/Formula/libvpx.rb
+++ b/Library/Formula/libvpx.rb
@@ -22,14 +22,10 @@ class Libvpx < Formula
 
     ENV.append "CXXFLAGS", "-DGTEST_USE_OWN_TR1_TUPLE=1" # Mavericks uses libc++ which doesn't supply <TR1/tuple>
 
-    # see http://code.google.com/p/webm/issues/detail?id=401
-    # Configure misdetects 32-bit 10.6.
-    # Determine if the computer runs Darwin 9, 10, or 11 using uname -r.
-    osver = %x[uname -r | cut -d. -f1].chomp
-    if MacOS.prefer_64_bit? then
-      args << "--target=x86_64-darwin#{osver}-gcc"
-    else
-      args << "--target=x86-darwin#{osver}-gcc"
+    # configure misdetects 32-bit 10.6
+    # http://code.google.com/p/webm/issues/detail?id=401
+    if MacOS.version == "10.6" && Hardware.is_32_bit?
+      args << "--target=x86-darwin10-gcc"
     end
 
     mkdir 'macbuild' do
-- 
cgit v1.2.3