X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-ust%2Flttng-ust-master.sh;h=be2f31e7da51da382098e1bd154f0d5ccbd3c621;hb=371b695fa77dc68877d4d1384acbcbef9949ec8a;hp=7fef714585b7af0f2f85d170c6d8519852313502;hpb=3801bff5f42ba75703756f2a900bed3bae4a2461;p=lttng-ci.git diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh index 7fef714..be2f31e 100755 --- a/lttng-ust/lttng-ust-master.sh +++ b/lttng-ust/lttng-ust-master.sh @@ -48,13 +48,15 @@ esac BUILD_PATH=$WORKSPACE case "$build" in oot) + echo "Out of tree build" BUILD_PATH=$WORKSPACE/oot mkdir -p $BUILD_PATH cd $BUILD_PATH $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS ;; dist) - BUILD_PATH=/tmp/dist + echo "Distribution out of tree build" + BUILD_PATH=`mktemp -d` # Initial configure and generate tarball ./configure @@ -71,6 +73,7 @@ case "$build" in ;; *) BUILD_PATH=$WORKSPACE + echo "Standard tree build" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS ;; esac @@ -98,3 +101,7 @@ make clean # Cleanup rpath and libtool .la files find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \; find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \; + +if [ $build = "dist" ] then + rm -rf $BUILD_PATH +fi