Merge pull request #419 from flatcar-linux/krnowak/pkg-updates-2021-part-3-toolchain-take-2

build_library/toolchain_util: Drop workaround for building stable gdb
This commit is contained in:
Krzesimir Nowak 2022-08-23 16:04:28 +02:00 committed by GitHub
commit 36c3f7bc9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -307,8 +307,8 @@ _crossdev_info() {
install_cross_toolchain() { install_cross_toolchain() {
local cross_chost="$1"; shift local cross_chost="$1"; shift
local cross_pkgs=( $(get_cross_pkgs $cross_chost) ) local cross_pkgs=( $(get_cross_pkgs $cross_chost) )
# gdb doesn't respect the --stable flag, set it stable explicitly # build gdb as an extra step, default to stable ebuilds
local cross_flags=( --gdb '[stable]' --ex-gdb --stable --target "${cross_chost}" ) local cross_flags=( --ex-gdb --stable --target "${cross_chost}" )
local cross_cfg="/usr/${cross_chost}/etc/portage/${cross_chost}-crossdev" local cross_cfg="/usr/${cross_chost}/etc/portage/${cross_chost}-crossdev"
local cross_cfg_data=$(_crossdev_info "${cross_flags[@]}") local cross_cfg_data=$(_crossdev_info "${cross_flags[@]}")
local cbuild="$(portageq envvar CBUILD)" local cbuild="$(portageq envvar CBUILD)"