Commit 3ec3c173 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

install-build-deps: select between lib32gcc1 and lib32gcc-s1 as needed.

Newer distros have lib32gcc-s1, but older, supported distros have
lib32gcc1. Support both, rather than only one of the two.

Bug: 1119692
Change-Id: I2ba4ee25507976683c987ea89623e7e0d80957af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372588Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarJunichi Uekawa <uekawa@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801445}
parent 84739b3d
......@@ -225,6 +225,15 @@ dev_list="\
# 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
# NaCl binaries.
if file -L /sbin/init | grep -q 'ELF 64-bit'; then
dev_list="${dev_list} libc6-i386 lib32stdc++6"
# lib32gcc-s1 used to be called lib32gcc1 in older distros.
if package_exists lib32gcc-s1; then
dev_list="${dev_list} lib32gcc-s1"
elif package_exists lib32gcc1; then
dev_list="${dev_list} lib32gcc1"
fi
dev_list="${dev_list} libc6-i386 lib32gcc-s1 lib32stdc++6"
fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment