sundowndev
/
homebrew-core
mirror of https://github.com/sundowndev/homebrew-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxMac: Fix build flags 

Use the standard `ENV.m32` to force a 32-bit build now that Homebrew's
environment tools can work with Objective C flags.

Only specify `-arch` flags when building Python modules---this prevents Python
from trying to build for more architectures than it should.

Fixes Homebrew/homebrew#10348.
master
Charlie Sharpsteen 2012-02-21 21:43:35 -08:00
parent 1e3af0d83d
commit b1600e93d1
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Formula/wxmac.rb
View File

@ -62,6 +62,8 @@ def install_wx_python
]
Dir.chdir "wxPython" do
if ARGV.build_devel?
ENV.append_to_cflags '-arch x86_64' if MacOS.prefer_64_bit?
system "python", "setup.py",
"build_ext",
"WXPORT=osx_cocoa",
@ -72,12 +74,8 @@ def install_wx_python
"WXPORT=osx_cocoa",
*opts
else # for wx 2.8 force 32-bit install with the 10.6 sdk:
%w{ CFLAGS CXXFLAGS LDFLAGS }.each do |compiler_flag|
ENV.remove compiler_flag, "-arch x86_64"
ENV.append compiler_flag, "-arch i386"
# The python extension for wx2.8 has to be built with the 10.6 sdk, but we have no configure step, so:
ENV.append compiler_flag, "-isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6"
end
ENV.append_to_cflags '-arch i386'
system "arch", "-i386",
"python",
"setup.py",
@ -122,15 +120,10 @@ def install_wx_python
unless ARGV.build_devel?
# Force i386 wor wx 2.8
%w{ CFLAGS CXXFLAGS LDFLAGS OBJCFLAGS OBJCXXFLAGS }.each do |compiler_flag|
ENV.remove compiler_flag, "-arch x86_64"
ENV.append compiler_flag, "-arch i386"
end
ENV.m32
# build will fail on Lion unless we use the 10.6 sdk (note wx 2.9 does fine)
if MacOS.lion?
args << "--with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk"
args << "--with-macosx-version-min=10.6"
end
ENV.append_to_cflags '-isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6' if MacOS.lion?
end
system "./configure", *args