X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=2ead92bae00382aaeaa06bb21811615b2ba5d172;hb=05b1bd91bac21de6fd5fbb3bbf2c239fc6256bf5;hp=9f6bc7182655cce711e04233759d93845f775f37;hpb=481eadc8ea5acbb527b707e50884e2bab37c2c69;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 9f6bc71..2ead92b 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -81,11 +81,13 @@ test_type=${test_type:-}
 
 DEPS_INC="$WORKSPACE/deps/build/include"
 DEPS_LIB="$WORKSPACE/deps/build/lib"
+DEPS_PKGCONFIG="$DEPS_LIB/pkgconfig"
 DEPS_BIN="$WORKSPACE/deps/build/bin"
 DEPS_JAVA="$WORKSPACE/deps/build/share/java"
 
 export PATH="$DEPS_BIN:$PATH"
 export LD_LIBRARY_PATH="$DEPS_LIB:${LD_LIBRARY_PATH:-}"
+export PKG_CONFIG_PATH="$DEPS_PKGCONFIG"
 export CPPFLAGS="-I$DEPS_INC"
 export LDFLAGS="-L$DEPS_LIB"
 
@@ -191,7 +193,7 @@ sol10-i386)
     export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
     export CPPFLAGS="-I/opt/csw/include -D_XOPEN_SOURCE=500 $CPPFLAGS"
     export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib $LDFLAGS"
-    export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
+    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/csw/lib/pkgconfig"
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
 
@@ -202,11 +204,11 @@ sol11-i386)
     export MAKE=gmake
     export TAR=gtar
     export NPROC=nproc
-    export PATH="$PATH:/usr/perl5/bin"
-    export CPPFLAGS="-I/opt/csw/include -D_XOPEN_SOURCE=500 $CPPFLAGS"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib $LDFLAGS"
+    export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin"
+    export CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
+    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib/pkgconfig"
 
     RUN_TESTS="no"
     ;;