summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2018-08-19 10:26:18 +0000
committerDmitry V. Levin <ldv@altlinux.org>2018-08-19 10:26:18 +0000
commit7b0d371b3f68a8747ca6f48a809d09e8d3d41122 (patch)
tree96309e6b326e23700e7a89c84665eb852eaabdd3 /ci
parentf0ec4e696ceb4b1e2c9b80daa5599431e6f9811c (diff)
downloadstrace-7b0d371b3f68a8747ca6f48a809d09e8d3d41122.tar.gz
ci: install kernel headers after compiler dependencies
* ci/install-dependencies.sh: Install kernel headers after compiler dependencies to avoid a needless attempt to install $common_packages.
Diffstat (limited to 'ci')
-rwxr-xr-xci/install-dependencies.sh27
1 files changed, 14 insertions, 13 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index f510772c0..4e5445f52 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -49,10 +49,23 @@ clone_repo()
git clone --depth=1 ${branch:+--branch $branch} "$src" "$dst"
}
+case "$CC" in
+ gcc-*)
+ retry_if_failed \
+ $sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ apt_get_install $common_packages "$CC"-multilib
+ ;;
+ clang*)
+ apt_get_install $common_packages "$CC"
+ ;;
+ *)
+ apt_get_install $common_packages
+ ;;
+esac
+
case "$KHEADERS" in
*/*)
clone_repo https://github.com/"$KHEADERS" kernel ${KBRANCH-}
- apt_get_install $common_packages
$sudo make -C kernel headers_install INSTALL_HDR_PATH=/opt/kernel
$sudo rm -rf kernel
KHEADERS_INC=/opt/kernel/include
@@ -63,20 +76,8 @@ case "$KHEADERS" in
esac
case "$CC" in
- gcc)
- apt_get_install $common_packages
- ;;
- gcc-*)
- retry_if_failed \
- $sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- apt_get_install $common_packages "$CC"-multilib
- ;;
- clang*)
- apt_get_install $common_packages "$CC"
- ;;
musl-gcc)
clone_repo strace/musl musl
- apt_get_install $common_packages
cd musl
CC=gcc
build=