aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorNikolay Kasyanov2013-01-16 11:00:25 +0400
committerAdam Vandenberg2013-01-17 07:48:19 -0800
commitdc39d737d68b2a303032cf6c095db1b7eed36898 (patch)
tree2e04c49cda0e2af0faeecdcfe7179a174c577f56 /Library/Formula
parent955dd2ada2a29875d063626eca8eba893bf229a3 (diff)
downloadhomebrew-dc39d737d68b2a303032cf6c095db1b7eed36898.tar.bz2
boost: fix universal build with c++11
specify linkflags & cxxflags explicitly Fixes #17084. Closes #17122. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/boost.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 30149bac7..a21118f36 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -104,9 +104,12 @@ class Boost < Formula
if MacOS.version >= :lion and build.include? 'with-c++11'
args << "toolset=clang" << "cxxflags=-std=c++11"
args << "cxxflags=-stdlib=libc++" << "cxxflags=-fPIC"
+ args << "cxxflags=-arch x86_64" if MacOS.prefer_64_bit? or build.universal?
+ args << "cxxflags=-arch i386" if !MacOS.prefer_64_bit? or build.universal?
args << "linkflags=-stdlib=libc++"
args << "linkflags=-headerpad_max_install_names"
- args << "linkflags=-arch x86_64"
+ args << "linkflags=-arch x86_64" if MacOS.prefer_64_bit? or build.universal?
+ args << "linkflags=-arch i386" if !MacOS.prefer_64_bit? or build.universal?
end
args << "address-model=32_64" << "architecture=x86" << "pch=off" if build.universal?