Bump version to 49:0

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

diff --git a/folly/bootstrap-osx-homebrew.sh b/folly/bootstrap-osx-homebrew.sh
index 9843c5e0a8e2812814119dbb1b17f9f2f26dd858..688ce4ddfb9239cf96ef1fd54b9cbc5588e5325c 100755 (executable)
--- a/folly/bootstrap-osx-homebrew.sh
+++ b/folly/bootstrap-osx-homebrew.sh
@@ -10,31 +10,13 @@ brewget() {
 }
 
 # tool dependencies: autotools and scons (for double-conversion)
-brewget autoconf automake libtool scons
+brewget autoconf automake libtool
 
 # dependencies
-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.
-test -d double-conversion || {
-    git clone https://github.com/floitsch/double-conversion.git
-    pushd double-conversion/src
-    ln -s . double-conversion
-    popd
-}
-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
-DOUBLE_CONVERSION_HOME=$(pwd)
-popd
+brewget glog gflags boost libevent double-conversion
 
 autoreconf -i
-./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME/src" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME"
+./configure
 
 pushd test
 test -e gtest-1.7.0.zip || {