aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHasan Veldstra2010-09-29 17:31:14 +0100
committerAdam Vandenberg2010-10-30 21:07:39 -0700
commit882d15c35ce4c66bb1c625d3c2a265f3e231215a (patch)
treed253c3f5cf118d0850ae1d5adcbb609a6a4085cf
parentff82919d38c13e9cc10b1c70733214b0927458bd (diff)
downloadhomebrew-882d15c35ce4c66bb1c625d3c2a265f3e231215a.tar.bz2
mod_wsgi Remove PPC flags from Makefile properly.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
-rw-r--r--Library/Formula/mod_wsgi.rb17
1 files changed, 5 insertions, 12 deletions
diff --git a/Library/Formula/mod_wsgi.rb b/Library/Formula/mod_wsgi.rb
index 5566861e8..fa96a2b34 100644
--- a/Library/Formula/mod_wsgi.rb
+++ b/Library/Formula/mod_wsgi.rb
@@ -27,19 +27,12 @@ class ModWsgi <Formula
system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
- # Find the archs of the Python we are building against.
- # We remove 'ppc' support, so we can pass Intel-optimized CFLAGS.
- archs = archs_for_command("python")
- archs.delete :ppc7400
- archs.delete :ppc64
- archs.delete :x86_64 if Hardware.is_32_bit?
-
inreplace 'Makefile' do |s|
- s.gsub! "-Wc,'-arch x86_64' -Wc,'-arch i386' -Wc,'-arch ppc7400'",
- archs.collect{ |a| "-Wc,'-arch #{a}'" }.join(' ')
-
- s.gsub! "-arch x86_64 -arch i386 -arch ppc7400",
- archs.collect{ |a| "-arch #{a}" }.join(' ')
+ # Remove 'ppc' support, so we can pass Intel-optimized CFLAGS.
+ cflags = s.get_make_var("CFLAGS")
+ cflags.gsub! "-Wc,'-arch ppc7400'", ""
+ cflags.gsub! "-Wc,'-arch ppc64'", ""
+ s.change_make_var! "CFLAGS", cflags
# --libexecdir parameter to ./configure isn't changing this, so cram it in
# This will be where the Apache module ends up, and we don't want to touch