summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorXU Benda <heroxbd@gmail.com>2013-09-04 23:43:28 +0900
committerXU Benda <heroxbd@gmail.com>2013-09-04 23:43:28 +0900
commit1f9f16ab1b837c18b373257887657bc437ad3c77 (patch)
tree834e757041003d4238a9f0519d755bbd40f28bb0 /eclass
parentclean up profile and use portage-2 format (diff)
downloadandroid-1f9f16ab1b837c18b373257887657bc437ad3c77.tar.gz
android-1f9f16ab1b837c18b373257887657bc437ad3c77.tar.bz2
android-1f9f16ab1b837c18b373257887657bc437ad3c77.zip
use rap flag in toolchain.eclass
fix glibc symlink add bootstrap profiles
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass22
1 files changed, 20 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 76d92e6..77fa3e4 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -46,7 +46,7 @@ is_crosscompile() {
# General purpose version check. Without a second arg matches up to minor version (x.x.x)
# (ie. 4.6.0_pre9999 matches 4 or 4.6 or 4.6.0 but not 4.6.1)
-tc_version_is_at_least() {
+tc_version_is_at_least() {
version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}"
}
@@ -118,7 +118,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
tc_version_is_at_least 4.6 && IUSE+=" graphite"
tc_version_is_at_least 4.6 && IUSE+=" lto"
- tc_version_is_at_least 4.7 && IUSE+=" go"
+ tc_version_is_at_least 4.7 && IUSE+=" go rap"
fi
# Support upgrade paths here or people get pissed
@@ -467,6 +467,18 @@ make_gcc_hard() {
BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
}
+prefix_gcc_dynamic_loader() {
+ local dlf
+
+ case $(tc-arch) in
+ amd64) dlf=i386/linux64.h ;;
+ arm) dlf=arm/linux-eabi.h ;;
+ x86) dlf=i386/linux.h ;;
+ esac
+
+ eprefixify gcc/config/${dlf}
+}
+
create_gcc_env_entry() {
dodir /etc/env.d/gcc
local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
@@ -1211,6 +1223,12 @@ gcc_do_configure() {
# which is unrelated to TOOLCHAIN_PREFIX, a.k.a. PREFIX
confgcc+=( --with-local-prefix="${TPREFIX}"/usr )
fi
+
+ if use rap ; then
+ # use sysroot of toolchain to get currect include and library at
+ # compile time
+ confgcc+=( --with-sysroot="${EPREFIX}" )
+ fi
fi
# __cxa_atexit is "essential for fully standards-compliant handling of
# destructors", but apparently requires glibc.