mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-16 08:01:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from marineam/cbuild

Browse Source 
Fixes for cross compiling
This commit is contained in:
Michael Marineau 2015-04-01 16:27:52 -07:00
commit 10c9a82f79
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_library/catalyst_toolchains.sh
View File

@ -16,7 +16,8 @@ configure_target_root() {
local cross_chost=$(get_board_chost "$1") local cross_chost=$(get_board_chost "$1")
local profile=$(get_board_profile "${board}") local profile=$(get_board_profile "${board}")
CHOST="${cross_chost}" \ CBUILD="$(portageq envvar CBUILD)" \
CHOST="${cross_chost}" \
ROOT="/build/${board}" \ ROOT="/build/${board}" \
SYSROOT="/usr/${cross_chost}" \ SYSROOT="/usr/${cross_chost}" \
_configure_sysroot "${profile}" _configure_sysroot "${profile}"

8
build_library/toolchain_util.sh
View File

@ -187,7 +187,8 @@ _get_dependency_list() {
# Configure a new ROOT # Configure a new ROOT
# Values are copied from the environment or the current host configuration. # Values are copied from the environment or the current host configuration.
# Usage: ROOT=/foo/bar SYSROOT=/foo/bar configure_portage coreos:some/profile # Usage: CBUILD=foo-bar-linux-gnu ROOT=/foo/bar SYSROOT=/foo/bar configure_portage coreos:some/profile
# Note: if using portageq to get CBUILD it must be called before CHOST is set.
_configure_sysroot() { _configure_sysroot() {
local profile="$1" local profile="$1"
@ -279,7 +280,10 @@ install_cross_libs() {
sudo="sudo -E" sudo="sudo -E"
fi fi
CHOST="${cross_chost}" ROOT="$ROOT" SYSROOT="$ROOT" \ CBUILD="$(portageq envvar CBUILD)" \
CHOST="${cross_chost}" \
ROOT="$ROOT" \
SYSROOT="$ROOT" \
_configure_sysroot "${CROSS_PROFILES[${cross_chost}]}" _configure_sysroot "${CROSS_PROFILES[${cross_chost}]}"
# In order to get a dependency list we must calculate it before # In order to get a dependency list we must calculate it before

2
setup_board
View File

@ -265,7 +265,7 @@ sudo cp /etc/portage/repos.conf/* "${BOARD_ETC}"/portage/repos.conf/
# make it easy to find debug symbols # make it easy to find debug symbols
sudo mkdir -p /usr/lib/debug/build sudo mkdir -p /usr/lib/debug/build
sudo ln -sfT /build/amd64-usr/usr/lib/debug /usr/lib/debug/build/amd64-usr sudo ln -sfT ${BOARD_ROOT}/usr/lib/debug /usr/lib/debug/${BOARD_ROOT}
generate_all_wrappers generate_all_wrappers