projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: librseq: update for ubuntu 22.04 builders
[lttng-ci.git]
/
scripts
/
librseq
/
build.sh
diff --git
a/scripts/librseq/build.sh
b/scripts/librseq/build.sh
index 826cfa91760c910fbf4111e9f38705e6e44a5191..d56a399fcdbe9869c88c971b44e24de5ff014c8e 100755
(executable)
--- a/
scripts/librseq/build.sh
+++ b/
scripts/librseq/build.sh
@@
-84,7
+84,7
@@
failed_configure() {
# Required variables
WORKSPACE=${WORKSPACE:-}
# Required variables
WORKSPACE=${WORKSPACE:-}
-
arch=${arch
:-}
+
platform=${platform
:-}
conf=${conf:-}
build=${build:-}
cc=${cc:-}
conf=${conf:-}
build=${build:-}
cc=${cc:-}
@@
-111,49
+111,17
@@
gcc)
export CC=gcc
export CXX=g++
;;
export CC=gcc
export CXX=g++
;;
-gcc-4.8)
- export CC=gcc-4.8
- export CXX=g++-4.8
- ;;
-gcc-5)
- export CC=gcc-5
- export CXX=g++-5
- ;;
-gcc-6)
- export CC=gcc-6
- export CXX=g++-6
- ;;
-gcc-7)
- export CC=gcc-7
- export CXX=g++-7
- ;;
-gcc-8)
- export CC=gcc-8
- export CXX=g++-8
+gcc-*)
+ export CC=gcc-${cc#gcc-}
+ export CXX=g++-${cc#gcc-}
;;
clang)
export CC=clang
export CXX=clang++
;;
;;
clang)
export CC=clang
export CXX=clang++
;;
-clang-3.9)
- export CC=clang-3.9
- export CXX=clang++-3.9
- ;;
-clang-4.0)
- export CC=clang-4.0
- export CXX=clang++-4.0
- ;;
-clang-5.0)
- export CC=clang-5.0
- export CXX=clang++-5.0
- ;;
-clang-6.0)
- export CC=clang-6.0
- export CXX=clang++-6.0
- ;;
-clang-7)
- export CC=clang-7
- export CXX=clang++-7
+clang-*)
+ export CC=clang-${cc#clang-}
+ export CXX=clang++-${cc#clang-}
;;
*)
if [ "x$cc" != "x" ]; then
;;
*)
if [ "x$cc" != "x" ]; then
@@
-168,7
+136,7
@@
if [ "x${CC:-}" != "x" ]; then
fi
# Set platform variables
fi
# Set platform variables
-case "$
arch
" in
+case "$
platform
" in
*)
export MAKE=make
export TAR=tar
*)
export MAKE=make
export TAR=tar
@@
-295,7
+263,7
@@
ret=$?
set -e
# Copy tap logs for the jenkins tap parser before cleaning the build dir
set -e
# Copy tap logs for the jenkins tap parser before cleaning the build dir
-
#
rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
+rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
# Clean the build directory
$MAKE clean
# Clean the build directory
$MAKE clean
This page took
0.029481 seconds
and
4
git commands to generate.