diff options
| author | Adam Vandenberg | 2012-07-23 12:17:54 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2012-07-23 12:18:57 -0700 |
| commit | 07c2d2db6113d64b8120eed35cc28029c31c5b42 (patch) | |
| tree | 8c58fab7b3df8c8752b5c926478de47afd885c41 /Library/Formula | |
| parent | 9180254d8a2696626b73a76eb94e1e7e0a91b18e (diff) | |
| download | homebrew-07c2d2db6113d64b8120eed35cc28029c31c5b42.tar.bz2 | |
jpeg-turbo: explicitly choose our nasm
64-bit builds won't work with the Xcode-provided nasm.
Explicitly select Homebrew's nasm in this case, so the user's
PATH won't cause the system version to be selected.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/jpeg-turbo.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Library/Formula/jpeg-turbo.rb b/Library/Formula/jpeg-turbo.rb index 4c0e32031..44c0cb1d6 100644 --- a/Library/Formula/jpeg-turbo.rb +++ b/Library/Formula/jpeg-turbo.rb @@ -11,7 +11,12 @@ class JpegTurbo < Formula def install args = ["--disable-dependency-tracking", "--prefix=#{prefix}"] - args << "--host=x86_64-apple-darwin" if MacOS.prefer_64_bit? + if MacOS.prefer_64_bit? + args << "--host=x86_64-apple-darwin" + # Auto-detect our 64-bit nasm + args << "NASM=#{Formula.factory('nasm').bin}/nasm" + end + system "./configure", *args system 'make' ENV.j1 # Stops a race condition error: file exists |