X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ivc%2Fbuild.sh;h=c008944bf11a5985fc2d67088d812a1eb6473ca0;hb=3b6ded166d659bde14b384ce4b3981d4378852ef;hp=8cc08acea45bc6dd532c513abde504e9df8453ad;hpb=62f05720140793e7f79c702eda016152b7bd7651;p=lttng-ci.git

diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index 8cc08ac..c008944 100644
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -xu
+#!/bin/bash
 #
 # Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
@@ -15,21 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
-
-URCU_INCS=${WORKSPACE}/deps/liburcu/build/include
-URCU_LIBS=${WORKSPACE}/deps/liburcu/build/lib
+set -xu
 
-# Get liburcu setup
-export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
-export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
-export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
+PYTHON3="python3"
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 # Tox does not support long path venv for whatever reason.
 PYENV_HOME=$(mktemp -d)
 
-
 # Create virtualenv and install necessary packages
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"