Commit 2ef7ef74 authored by Hans Fugal's avatar Hans Fugal Committed by Sara Golemon

fix osx bootstrap for new double-conversion directory structure

Summary:
Because https://github.com/google/double-conversion/commit/64702b40a2499702f9157ef015f0da6e006114bf

If this breaks an existing checkout, it is because you have an old version of double-conversion now. Go ahead and `rm -rf` it, or start with a clean folly clone.

Test Plan: Clean repo, `./bootstr<tab>`.

Reviewed By: jsedgwick@fb.com

Subscribers: exa, folly-diffs@, yfeldblum, chalfant

FB internal diff: D2136836

Signature: t1:2136836:1433874889:6f6c6a7bd337e052c088aabf89955e9b21b1d8e1
parent 2aa61de1
...@@ -17,15 +17,11 @@ brewget glog gflags boost libevent ...@@ -17,15 +17,11 @@ brewget glog gflags boost libevent
# Install the double-conversion library. # Install the double-conversion library.
# NB their install target installs the libs but not the headers, hence the # NB their install target installs the libs but not the headers, hence the
# CPPFLAGS and link shenanigans. # CPPFLAGS
test -d double-conversion || { test -d double-conversion ||
git clone https://github.com/floitsch/double-conversion.git git clone https://github.com/floitsch/double-conversion.git
pushd double-conversion/src
ln -s . double-conversion
popd
}
pushd double-conversion pushd double-conversion
scons make
# fool libtool into using static linkage # fool libtool into using static linkage
# (this won't work if you've already installed libdouble-conversion into a # (this won't work if you've already installed libdouble-conversion into a
# default search path) # default search path)
...@@ -34,7 +30,7 @@ DOUBLE_CONVERSION_HOME=$(pwd) ...@@ -34,7 +30,7 @@ DOUBLE_CONVERSION_HOME=$(pwd)
popd popd
autoreconf -i autoreconf -i
./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME/src" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME" ./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME"
pushd test pushd test
test -e gtest-1.7.0.zip || { test -e gtest-1.7.0.zip || {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment