Skip to content

Commit e61e550

Browse files
committed
only install gcc-multilib on amd64 hosts
Signed-off-by: reubenmiller <[email protected]>
1 parent 460e1ac commit e61e550

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

mk/install-build-tools.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,15 @@ aarch64-unknown-linux-gnu)
9999
# Clang is needed for code coverage.
100100
use_clang=1
101101
install_packages \
102-
gcc-multilib \
103102
qemu-user \
104103
gcc-aarch64-linux-gnu \
105104
libc6-arm64-cross \
106105
libc6-dev-arm64-cross \
107106
crossbuild-essential-arm64
107+
108+
# gcc-multilib only exists on amd64 host machines
109+
install_packages_on_amd64 \
110+
gcc-multilib
108111
;;
109112
aarch64-unknown-linux-musl)
110113
use_clang=1
@@ -284,7 +287,7 @@ linux*)
284287
TMP_GPG_FILE=$(mktemp)
285288
cat mk/llvm-snapshot.gpg.key | gpg --yes --dearmor -o "$TMP_GPG_FILE"
286289
if ! cmp --silent "$TMP_GPG_FILE" /usr/share/keyrings/llvm-snapshot.gpg; then
287-
sudo mkdir -p /usr/share/keyrings
290+
sudo mkdir -p /usr/share/keyrings
288291
sudo mv "$TMP_GPG_FILE" /usr/share/keyrings/llvm-snapshot.gpg
289292
sudo chmod 0644 /usr/share/keyrings/llvm-snapshot.gpg
290293
else
@@ -293,7 +296,7 @@ linux*)
293296
# Add repository to sources.list.d
294297
SOURCE_FILE="/etc/apt/sources.list.d/llvm-${llvm_version}-toolchain.list"
295298
if [ ! -f "$SOURCE_FILE" ]; then
296-
echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/$ubuntu_codename/ llvm-toolchain-$ubuntu_codename-$llvm_version main" | \
299+
echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/$ubuntu_codename/ llvm-toolchain-$ubuntu_codename-$llvm_version main" | \
297300
sudo tee "$SOURCE_FILE" > /dev/null
298301
fi
299302
sudo apt-get update -y

0 commit comments

Comments
 (0)