[gentoo-commits] proj/crossdev:master commit in: /

[Steve Arnold]

commit:     a5554b4a85fa320781af41483488cfc65d22b98c
Author:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 17:32:55 2017 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 17:32:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=a5554b4a

Update avr/armv7m with USE=cxx for stage4, use crossdev HCHOST variable

* upstream projects need c++, however, stage3 is still the default

Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>

 crossdev | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/crossdev b/crossdev
index 1a0bded..0eaa721 100755
--- a/crossdev
+++ b/crossdev
@@ -227,8 +227,9 @@ parse_target() {
                avr*) KPKG="[none]"
                      LCAT="dev-embedded"
                      LPKG="avr-libc"
-                     GUSE="-fortran -go -pie nopie" # doesn't work
+                     GUSE+=" -fortran -go -pie nopie" # doesn't work
                      MULTILIB_USE="yes" #377039
+                     BUSE+=" cxx"
                      STAGE_DEFAULT=${STAGE_LIBC}
                      MAKE_SYMLINK="yes"
                      WITH_DEF_HEADERS="no";;
@@ -306,7 +307,7 @@ parse_target() {
                        LPKG="newlib"
                        KPKG="[none]"
                        STAGE_DEFAULT=${STAGE_LIBC}
-                       GUSE+=" -openmp" #489798
+                       GUSE+=" cxx -openmp" #489798
                        MULTILIB_USE="yes" #407275
                        WITH_DEF_HEADERS="no"
                        ;;
@@ -1229,7 +1230,7 @@ USE="${USE} -selinux"
 if ! ex_fast ; then
 
        # stage 0: binutils
-       doemerge ${BPKG}
+       USE="${BUSE}" doemerge ${BPKG}
 
        # stage1: bare C compiler
        if is_s1 ; then
@@ -1292,7 +1293,7 @@ if ! ex_fast ; then
        if [[ ${MAKE_SYMLINK} == "yes" ]] ; then
                case ${CTARGET} in
                        avr*)   ( ! [[ -h 
${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d 
${EPREFIX}/usr/${CTARGET}/lib ]] ) && \
-                                       ln -s 
${EPREFIX}/usr/${CHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/
+                                       ln -s 
${EPREFIX}/usr/${HCHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/
                                ;;
                        *)      ;;
                esac