aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorMax Howell2009-10-12 19:51:17 +0100
committerMax Howell2009-10-12 22:41:16 +0100
commita051c1191bff59c3f43600a8750e7a93b0e87389 (patch)
tree5854efb3a7c498d57a1623bfdff21380ce78bb12 /Library/Formula
parentbf2529463e5c9a820175859bf81c40ea399d1d9d (diff)
downloadhomebrew-a051c1191bff59c3f43600a8750e7a93b0e87389.tar.bz2
Fix Qt build on SL
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/qt.rb22
1 files changed, 15 insertions, 7 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 0451645c0..c12479d7b 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -12,13 +12,21 @@ class Qt <Formula
makefiles.each { |makefile| `echo 'LIBS += -lsqlite3' >> src/#{makefile}` }
end
- system "./configure", "-prefix", prefix,
- "-system-sqlite", "-system-libpng", "-system-zlib",
- "-nomake", "demos", "-nomake", "examples", "-no-qt3support",
- "-release", "-cocoa", "-arch x86",
- "-confirm-license", "-opensource",
- "-I/usr/X11R6/include", "-L/usr/X11R6/lib",
- "-fast"
+ conf_args = ["-prefix", prefix,
+ "-system-sqlite", "-system-libpng", "-system-zlib",
+ "-nomake", "demos", "-nomake", "examples", "-no-qt3support",
+ "-release", "-cocoa",
+ "-confirm-license", "-opensource",
+ "-I/usr/X11R6/include", "-L/usr/X11R6/lib",
+ "-fast"]
+
+ if MACOS_VERSION >= 10.6
+ conf_args << '-arch' << 'x86_64'
+ else
+ conf_args << '-arch' << 'x86'
+ end
+
+ system "./configure", *conf_args
system "make install"
# fuck weird prl files