make_choot: update bison before crossdev.
We want to update bison before calling crossdev because
glibc wants a newer version of bison.
BUG=chromium:83435
TEST=cros_sdk --bootstrap works with glibc 2.27
Change-Id: I043c5b556e9bfb67cefc28ea6812f39e385b65d3
Reviewed-on: https://chromium-review.googlesource.com/1044763
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index f50d967..0fcf367 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -606,6 +606,10 @@
info "Updating ncurses"
early_enter_chroot emerge -uNvq sys-libs/ncurses
+# The stage3 contains an old version of bison and glibc 2.26+ wants a newer one.
+info "Updating bison"
+early_enter_chroot emerge -uNvq sys-devel/bison
+
info "Updating host toolchain"
if [[ ! -e "${FLAGS_chroot}/usr/bin/crossdev" ]]; then
early_enter_chroot $EMERGE_CMD -uNv crossdev
@@ -639,10 +643,9 @@
# sys-apps/sandbox upgrade breaks dev-libs/nss.
# sys-devel/patch 2.6 misapplies git patches in dev-embedded/coreboot-sdk.
# older sys-devel/automake makes media-libs/freetype build flaky.
-# sys-devel/bison glibc 2.27 requires bison to be 2.7 or newer.
info "Updating preinstalled build tools"
early_enter_chroot ${EMERGE_CMD} -uNv ${USEPKG} --select ${EMERGE_JOBS} \
- sys-apps/sandbox '>=sys-devel/patch-2.7' sys-devel/automake sys-devel/bison
+ sys-apps/sandbox '>=sys-devel/patch-2.7' sys-devel/automake
# Update chroot.
# Skip toolchain update because it already happened above, and the chroot is