Merge pull request #20 from alexmonthy/fix-scope

[lttng-ci.git] / scripts / babeltrace / build.sh

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 4dc939d1b1637f12c501e672ab737b4e79974455..2310b3653890630da8bc0b4dfafeafb688ed8baf 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -16,6 +16,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Required parameters
+arch=${arch:-}
+conf=${conf:-}
+build=${build:-}
+
 
 SRCDIR="$WORKSPACE/src/babeltrace"
 TMPDIR="$WORKSPACE/tmp"
@@ -35,6 +40,7 @@ solaris10)
     NPROC=gnproc
     BISON=bison
     YACC="$BISON -y"
+    export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
     ;;
 solaris11)
     MAKE=gmake
@@ -109,7 +115,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" "$SRCDIR/configure"
@@ -138,7 +144,7 @@ case "$build" in
 esac
 
 # BUILD!
-$MAKE -j `$NPROC` V=1
+$MAKE -j "$($NPROC)" V=1
 $MAKE install
 
 # Run tests