mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 21:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303 from marineam/fixes

Browse Source 
Toolchain build fixes
This commit is contained in:
Michael Marineau 2014-07-22 12:44:41 -07:00
commit 4ca4b65dba
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_library/toolchain_util.sh
View File

@ -290,6 +290,10 @@ install_cross_libs() {
"$ROOT/etc/portage/cross-${cross_chost}-depends") "$ROOT/etc/portage/cross-${cross_chost}-depends")
# Add toolchain to packages.provided since they are on the host system # Add toolchain to packages.provided since they are on the host system
if [[ -f "${package_provided}" ]]; then
# emerge-wrapper is trying a similar trick but doesn't work
$sudo rm -f "${package_provided}"
fi
$sudo mkdir -p "${package_provided}" $sudo mkdir -p "${package_provided}"
local native_pkg cross_pkg cross_pkg_version local native_pkg cross_pkg cross_pkg_version
for native_pkg in "${TOOLCHAIN_PKGS[@]}"; do for native_pkg in "${TOOLCHAIN_PKGS[@]}"; do

3
setup_board
View File

@ -259,12 +259,13 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
if [[ "${FLAGS_jobs}" -ne -1 ]]; then if [[ "${FLAGS_jobs}" -ne -1 ]]; then
EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}" EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
fi fi
EMERGE_TOOLCHAIN_FLAGS="${EMERGE_FLAGS}"
if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" && \ if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" && \
"${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]] "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]]
then then
EMERGE_FLAGS+=" --usepkg --getbinpkg" EMERGE_FLAGS+=" --usepkg --getbinpkg"
EMERGE_TOOLCHAIN_FLAGS="${EMERGE_FLAGS} --usepkgonly" EMERGE_TOOLCHAIN_FLAGS+=" --usepkgonly"
else else
# When binary packages are disabled we need to make sure the cross # When binary packages are disabled we need to make sure the cross
# sysroot includes any build dependencies for the toolchain. # sysroot includes any build dependencies for the toolchain.