Commit ae33cf61 authored by Kenton Varda's avatar Kenton Varda

Remove old compiler from test script.

parent 8bcec20b
...@@ -99,9 +99,7 @@ __EOF__ ...@@ -99,9 +99,7 @@ __EOF__
exit 0 exit 0
elif [ "x$1" == "xclean" ]; then elif [ "x$1" == "xclean" ]; then
rm -rf tmp-staging rm -rf tmp-staging
cd compiler cd c++
doit cabal clean
cd ../c++
if [ -e Makefile ]; then if [ -e Makefile ]; then
doit make maintainer-clean doit make maintainer-clean
fi fi
...@@ -113,6 +111,7 @@ __EOF__ ...@@ -113,6 +111,7 @@ __EOF__
echo "commands:" echo "commands:"
echo " test Runs tests (the default)." echo " test Runs tests (the default)."
echo " clang Runs tests using Clang compiler." echo " clang Runs tests using Clang compiler."
echo " gcc-4.8 Runs tests using gcc-4.8."
echo " remote HOST Runs tests on HOST via SSH." echo " remote HOST Runs tests on HOST via SSH."
echo " kenton Kenton's meta-test (uses hosts on Kenton's network)." echo " kenton Kenton's meta-test (uses hosts on Kenton's network)."
echo " clean Delete temporary files that may be left after failure." echo " clean Delete temporary files that may be left after failure."
...@@ -134,15 +133,6 @@ mkdir $STAGING/lib ...@@ -134,15 +133,6 @@ mkdir $STAGING/lib
export PATH=$STAGING/bin:$PATH export PATH=$STAGING/bin:$PATH
export LD_LIBRARY_PATH=$STAGING/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH=$STAGING/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
echo "========================================================================="
echo "Building compiler"
echo "========================================================================="
cd compiler
doit cabal install --bindir="$STAGING/bin" --libdir="$STAGING/lib" capnproto-compiler.cabal
doit cabal clean
cd ..
echo "=========================================================================" echo "========================================================================="
echo "Building c++" echo "Building c++"
echo "=========================================================================" echo "========================================================================="
......
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