X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fbabeltrace%2Fbuild.sh;h=442feb94be46495eec7454e7537fb50e340a82b4;hb=0628a9d8d35076a287a887be0421fbca9f7a3cdf;hp=29f470f4ebd4576fd20d89ab238aaed264431948;hpb=b0005cd5b6b9c258a93a1ff4bd68d51f38a245ec;p=lttng-ci.git

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 29f470f..442feb9 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -39,6 +39,16 @@ solaris11)
     YACC="$BISON -y"
     export PATH="$PATH:/usr/perl5/bin"
     ;;
+macosx)
+    MAKE=make
+    TAR=tar
+    NPROC="getconf _NPROCESSORS_ONLN"
+    BISON="bison"
+    YACC="$BISON -y"
+    export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    export CFLAGS="-I/opt/local/include"
+    export LDFLAGS="-L/opt/local/lib"
+    ;;
 *)
     MAKE=make
     TAR=tar
@@ -55,7 +65,7 @@ static)
     echo "Static build"
     CONF_OPTS="--enable-static --disable-shared"
     ;;
-python-bindings)  
+python-bindings)
     echo "Build with python bindings"
     # We only support bindings built with Python 3
     export PYTHON="python3"
@@ -93,7 +103,7 @@ case "$build" in
 
     dist)
         echo "Distribution out of tree build"
-	BUILD_PATH=`mktemp -d`
+        BUILD_PATH=`mktemp -d`
 
         # Initial configure and generate tarball
         MAKE=$MAKE BISON="$BISON" YACC="$YACC" ./configure
@@ -112,7 +122,13 @@ case "$build" in
         TEST_PLAN_PATH=$BUILD_PATH
         ;;
 
-*)
+    clang)
+        echo "LLVM clang build"
+        export CC=clang
+        clang -v
+	MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+        ;;
+    *)
         echo "Standard tree build"
         MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
         ;;
@@ -123,10 +139,7 @@ $MAKE -j `$NPROC` V=1
 $MAKE install
 
 # Run tests
-cd ./tests
-# Run make check tests
-prove --merge -v --exec '' - < $WORKSPACE/tests/tests
-cd ..
+$MAKE check
 
 $MAKE clean