diff options
| author | Charlie Sharpsteen | 2011-09-20 10:13:16 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-09-20 10:13:16 -0700 |
| commit | 5c3e9153ee5d70c8de84492cdd980a3953fe238e (patch) | |
| tree | 323388168ab194f35befb8432809fa970b0f2af1 /Library | |
| parent | 1da2043d4db6a26fe68539ff7f3ac8fe812617e1 (diff) | |
| download | homebrew-5c3e9153ee5d70c8de84492cdd980a3953fe238e.tar.bz2 | |
Fuse4x: Tweak universal binary settings
Make sure that 64 bit builds aren't attempted on older Intel Macs.
Fixes #7713.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/fuse4x-kext.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/fuse4x.rb | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Library/Formula/fuse4x-kext.rb b/Library/Formula/fuse4x-kext.rb index c67c8a09c..a555e5a2d 100644 --- a/Library/Formula/fuse4x-kext.rb +++ b/Library/Formula/fuse4x-kext.rb @@ -22,7 +22,7 @@ class Fuse4xKext < Formula "SYMROOT=build", # Build a 32-bit kernel extension on Leopard and a fat binary for Snow # Leopard/Lion. - "ARCHS=i386 #{'x86_64' unless MacOS.leopard?}", 'ONLY_ACTIVE_ARCH=NO' + "ARCHS=i386 #{'x86_64' if MacOS.prefer_64_bit?}", 'ONLY_ACTIVE_ARCH=NO' ] system "/usr/bin/xcodebuild", *args diff --git a/Library/Formula/fuse4x.rb b/Library/Formula/fuse4x.rb index 930dd1f47..94de9d416 100644 --- a/Library/Formula/fuse4x.rb +++ b/Library/Formula/fuse4x.rb @@ -9,11 +9,16 @@ class Fuse4x < Formula depends_on 'fuse4x-kext' def install + # Build universal if the hardware can handle it---otherwise 32 bit only + MacOS.prefer_64_bit? ? ENV.universal_binary : ENV.m32 gettext = Formula.factory('gettext') + # Don't hardwire a universal binary build in the CFLAGS and LDFLAGS + # see issue #7713 + inreplace 'configure.in', '-arch i386 -arch x86_64', '' ENV['ACLOCAL'] = "/usr/bin/aclocal -I#{gettext.share}/aclocal" - system "autoreconf", "--force", "--install" + system "./configure", "--disable-dependency-tracking", "--disable-debug", "--disable-static", "--prefix=#{prefix}" system "make install" end |