Commit 722307a0 authored by Kenton Varda's avatar Kenton Varda

Make sure to use -stdlib=libc++ when building samples on OSX.

parent 833055bf
...@@ -17,6 +17,9 @@ if [ $# -gt 0 ]; then ...@@ -17,6 +17,9 @@ if [ $# -gt 0 ]; then
fi fi
HOST=$2 HOST=$2
shift 2 shift 2
echo "========================================================================="
echo "Pushing code to $HOST..."
echo "========================================================================="
ssh $HOST 'rm -rf tmp-test-capnp && mkdir tmp-test-capnp && git init tmp-test-capnp' ssh $HOST 'rm -rf tmp-test-capnp && mkdir tmp-test-capnp && git init tmp-test-capnp'
git push ssh://$HOST/~/tmp-test-capnp master:test git push ssh://$HOST/~/tmp-test-capnp master:test
ssh $HOST "cd tmp-test-capnp && git checkout test && ./super-test.sh $@ && cd .. && rm -rf tmp-test-capnp" ssh $HOST "cd tmp-test-capnp && git checkout test && ./super-test.sh $@ && cd .. && rm -rf tmp-test-capnp"
...@@ -134,6 +137,9 @@ if [ "x`uname`" == xDarwin ]; then ...@@ -134,6 +137,9 @@ if [ "x`uname`" == xDarwin ]; then
exit 1 exit 1
fi fi
export CXX=~/clang-3.2/bin/clang++ export CXX=~/clang-3.2/bin/clang++
SAMPLE_CXXFLAGS=-stdlib=libc++
else
SAMPLE_CXXFLAGS=
fi fi
cd c++ cd c++
...@@ -150,7 +156,7 @@ doit make install ...@@ -150,7 +156,7 @@ doit make install
cd samples cd samples
doit capnpc -oc++ addressbook.capnp -I"$STAGING"/include doit capnpc -oc++ addressbook.capnp -I"$STAGING"/include
doit ${CXX:-g++} -std=c++11 -I"$STAGING"/include -L"$STAGING"/lib \ doit ${CXX:-g++} -std=c++11 $SAMPLE_CXXFLAGS -I"$STAGING"/include -L"$STAGING"/lib \
addressbook.c++ addressbook.capnp.c++ -lcapnp -o addressbook addressbook.c++ addressbook.capnp.c++ -lcapnp -o addressbook
echo "@@@@ ./addressbook (in various configurations)" echo "@@@@ ./addressbook (in various configurations)"
./addressbook write | ./addressbook read ./addressbook write | ./addressbook read
......
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