std::atomicize MicroSpinLock.

[folly.git] / folly / bootstrap-osx-homebrew.sh

diff --git a/folly/bootstrap-osx-homebrew.sh b/folly/bootstrap-osx-homebrew.sh
index 6565f4b67271f4d6e54ce8511c359d7d6e745539..da1f73ed24be33542696bfa1a2cce41a809a41b1 100755 (executable)
--- a/folly/bootstrap-osx-homebrew.sh
+++ b/folly/bootstrap-osx-homebrew.sh
@@ -9,8 +9,8 @@ brewget() {
     brew install $@ || brew upgrade $@
 }
 
-# tool dependencies: autotools, scons (for double-conversion), and gcc 4.9
-brewget autoconf automake libtool scons gcc
+# tool dependencies: autotools and scons (for double-conversion)
+brewget autoconf automake libtool scons
 
 # dependencies
 brewget glog gflags boost libevent
@@ -18,7 +18,6 @@ brewget glog gflags boost libevent
 # Install the double-conversion library.
 # NB their install target installs the libs but not the headers, hence the
 # CPPFLAGS and link shenanigans.
-DOUBLE_CONVERSION_CPPFLAGS="-I./double-conversion/src"
 test -d double-conversion || {
     git clone https://github.com/floitsch/double-conversion.git
     pushd double-conversion/src
@@ -31,7 +30,15 @@ scons
 # (this won't work if you've already installed libdouble-conversion into a
 # default search path)
 rm -f libdouble-conversion*dylib
+DOUBLE_CONVERSION_HOME=$(pwd)
 popd
 
 autoreconf -i
-./configure CPPFLAGS="-I./double-conversion/src" LDFLAGS="-L./double-conversion" CXX=g++-4.9
+./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME/src" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME"
+
+pushd test
+test -d gtest-1.7.0 || {
+    curl -O https://googletest.googlecode.com/files/gtest-1.7.0.zip
+    unzip gtest-1.7.0.zip
+}
+popd