aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorXiyue Deng2013-10-01 00:09:38 -0700
committerXiyue Deng2013-10-01 00:49:06 -0700
commit329fb40f8b687332be7e9d256e27a08636e093ba (patch)
tree8356147467eb32ef05189ba89767dfe38857106a /Library
parent4ec6871958dd929c6bda9a8921f357f78de7e9fb (diff)
downloadhomebrew-329fb40f8b687332be7e9d256e27a08636e093ba.tar.bz2
boost: Fix C++11 build.
* Use default darwin toolset. - Used to set toolset as clang in C++11 build, which will override darwin settings and fail to increase template depth which is required for some of the libraries such as Boost.Log. * Remove unnecessary "-fPIC" build flag. Closes #22942.
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/boost.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 702d6d315..7f9b0eaa3 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -95,8 +95,6 @@ class Boost < Formula
# we specify libdir too because the script is apparently broken
bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"]
- bargs << "--with-toolset=clang" if build.with? "c++11"
-
if build.with? 'icu'
icu4c_prefix = Formula.factory('icu4c').opt_prefix
bargs << "--with-icu=#{icu4c_prefix}"
@@ -138,8 +136,7 @@ class Boost < Formula
end
if MacOS.version >= :lion and build.with? 'c++11'
- args << "toolset=clang" << "cxxflags=-std=c++11"
- args << "cxxflags=-stdlib=libc++" << "cxxflags=-fPIC"
+ args << "cxxflags=-std=c++11" << "cxxflags=-stdlib=libc++"
args << "cxxflags=-arch #{Hardware::CPU.arch_64_bit}" if MacOS.prefer_64_bit? or build.universal?
args << "cxxflags=-arch #{Hardware::CPU.arch_32_bit}" if !MacOS.prefer_64_bit? or build.universal?
args << "linkflags=-stdlib=libc++"