diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-configure-runtime.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc index 34bfaeb960..d2e4ab334b 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc | |||
@@ -16,26 +16,32 @@ RUNTIMETARGET = "libssp libstdc++-v3" | |||
16 | 16 | ||
17 | do_configure () { | 17 | do_configure () { |
18 | export CXX="${CXX} -nostdinc++ -nostdlib++" | 18 | export CXX="${CXX} -nostdinc++ -nostdlib++" |
19 | for d in ${RUNTIMETARGET}; do | 19 | mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##` |
20 | target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` | ||
21 | cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} | ||
22 | for d in libgcc ${RUNTIMETARGET}; do | ||
20 | echo "Configuring $d" | 23 | echo "Configuring $d" |
21 | mkdir -p ${B}/$d/ | 24 | rm -rf ${B}/$target/$d/ |
22 | cd ${B}/$d/ | 25 | mkdir -p ${B}/$target/$d/ |
26 | cd ${B}/$target/$d/ | ||
23 | chmod a+x ${S}/$d/configure | 27 | chmod a+x ${S}/$d/configure |
24 | ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} | 28 | ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} |
25 | done | 29 | done |
26 | } | 30 | } |
27 | 31 | ||
28 | do_compile () { | 32 | do_compile () { |
29 | for d in ${RUNTIMETARGET}; do | 33 | target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` |
30 | cd ${B}/$d/ | 34 | for d in libgcc ${RUNTIMETARGET}; do |
31 | oe_runmake | 35 | cd ${B}/$target/$d/ |
36 | oe_runmake MULTIBUILDTOP=${B}/$target/$d/ | ||
32 | done | 37 | done |
33 | } | 38 | } |
34 | 39 | ||
35 | do_install () { | 40 | do_install () { |
41 | target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` | ||
36 | for d in ${RUNTIMETARGET}; do | 42 | for d in ${RUNTIMETARGET}; do |
37 | cd ${B}/$d/ | 43 | cd ${B}/$target/$d/ |
38 | oe_runmake 'DESTDIR=${D}' install | 44 | oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install |
39 | done | 45 | done |
40 | chown -R root:root ${D} | 46 | chown -R root:root ${D} |
41 | } | 47 | } |
@@ -45,4 +51,3 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc" | |||
45 | PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" | 51 | PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" |
46 | 52 | ||
47 | BBCLASSEXTEND = "nativesdk" | 53 | BBCLASSEXTEND = "nativesdk" |
48 | |||