folly/wangle -> wangle cutover

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

diff --git a/folly/bootstrap-osx-homebrew.sh b/folly/bootstrap-osx-homebrew.sh
index 6565f4b67271f4d6e54ce8511c359d7d6e745539..688ce4ddfb9239cf96ef1fd54b9cbc5588e5325c 100755 (executable)
--- a/folly/bootstrap-osx-homebrew.sh
+++ b/folly/bootstrap-osx-homebrew.sh
@@ -9,29 +9,18 @@ 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
 
 # dependencies
-brewget glog gflags boost libevent
+brewget glog gflags boost libevent double-conversion
 
-# 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
-    ln -s . double-conversion
-    popd
+autoreconf -i
+./configure
+
+pushd test
+test -e gtest-1.7.0.zip || {
+    curl -O https://googletest.googlecode.com/files/gtest-1.7.0.zip
+    unzip gtest-1.7.0.zip
 }
-pushd double-conversion
-scons
-# fool libtool into using static linkage
-# (this won't work if you've already installed libdouble-conversion into a
-# default search path)
-rm -f libdouble-conversion*dylib
 popd
-
-autoreconf -i
-./configure CPPFLAGS="-I./double-conversion/src" LDFLAGS="-L./double-conversion" CXX=g++-4.9