diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-11 23:51:01 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-11 23:51:01 +0100 |
| commit | 75ed4c8e0021ee4c0526297f68d96c9cc69a1493 (patch) | |
| tree | 69d9b005f37156a637c8736a6d60c732526c59dc /doc | |
| parent | Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay (diff) | |
| download | multilib-portage-75ed4c8e0021ee4c0526297f68d96c9cc69a1493.tar.gz multilib-portage-75ed4c8e0021ee4c0526297f68d96c9cc69a1493.tar.bz2 multilib-portage-75ed4c8e0021ee4c0526297f68d96c9cc69a1493.zip | |
flag-o-matic should not be inherited before base
Add CHOST to the save and restore list
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/experimental/multilib-native.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/experimental/multilib-native.eclass b/doc/experimental/multilib-native.eclass index 7a3ed47d4..d155c2867 100644 --- a/doc/experimental/multilib-native.eclass +++ b/doc/experimental/multilib-native.eclass @@ -15,7 +15,7 @@ if use lib32; then EMULTILIB_PKG="true" fi -inherit flag-o-matic base multilib +inherit base multilib flag-o-matic case "${EAPI:-0}" in 2) @@ -85,6 +85,7 @@ declare -a EMULTILIB_FCFLAGS declare -a EMULTILIB_LDFLAGS # Saved Portage/eclass variables +declare -a EMULTILIB_CHOST declare -a EMULTILIB_S declare -a EMULTILIB_KDE_S declare -a EMULTILIB_CCACHE_DIR @@ -210,7 +211,7 @@ _setup_platform_env() { local pyver="" [[ -z "${EMULTILIB_MACHINE_NAME[${EMULTILIB_ARRAY_INDEX}]}" ]] && die "Unknown ABI (${1})" CHOST="${EMULTILIB_MACHINE_NAME[${EMULTILIB_ARRAY_INDEX}]}-${CHOST#*-}" - + multilib_debug "CHOST" ${CHOST} # Set compiler and linker ABI flags append-flags "${EMULTILIB_COMPILER_ABI_FLAGS[${EMULTILIB_ARRAY_INDEX}]}" append-ldflags "${EMULTILIB_COMPILER_ABI_FLAGS[${EMULTILIB_ARRAY_INDEX}]}" @@ -281,6 +282,7 @@ _save_platform_env() { EMULTILIB_LDFLAGS[${EMULTILIB_ARRAY_INDEX}]="${LDFLAGS}" # Saved Portage/eclass variables + EMULTILIB_CHOST[${EMULTILIB_ARRAY_INDEX}]="${CHOST}" EMULTILIB_S[${EMULTILIB_ARRAY_INDEX}]="${S}" EMULTILIB_KDE_S[${EMULTILIB_ARRAY_INDEX}]="${KDE_S}" EMULTILIB_CCACHE_DIR[${EMULTILIB_ARRAY_INDEX}]="${CCACHE_DIR}" @@ -313,6 +315,7 @@ _restore_platform_env() { LDFLAGS="${EMULTILIB_LDFLAGS[${EMULTILIB_ARRAY_INDEX}]}" # Saved Portage/eclass variables + CHOST="${EMULTILIB_CHOST[${EMULTILIB_ARRAY_INDEX}]}" S="${EMULTILIB_S[${EMULTILIB_ARRAY_INDEX}]}" KDE_S="${EMULTILIB_KDE_S[${EMULTILIB_ARRAY_INDEX}]}" CCACHE_DIR="${EMULTILIB_CCACHE_DIR[${EMULTILIB_ARRAY_INDEX}]}" |