X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=2ead92bae00382aaeaa06bb21811615b2ba5d172;hb=05b1bd91bac21de6fd5fbb3bbf2c239fc6256bf5;hp=7637bc0332f49f37d874342040acd7bcc38b3ca4;hpb=b8bdba8fb4522add7a0bd9616ed717002bd81f54;p=lttng-ci.git diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 7637bc0..2ead92b 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -193,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" @@ -204,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" ;;