summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-01-15 18:47:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-17 22:04:50 +0000
commit0df3c481309e89b93e8a57773eb9c470b4dd13a7 (patch)
treed8f0bbaa5672dee61273d5502546409034d0a5d8 /meta/recipes-devtools/gcc/gcc-configure-runtime.inc
parent2ce2c1e6f9c5196c4346c3839bf594dd821c20ee (diff)
downloadpoky-0df3c481309e89b93e8a57773eb9c470b4dd13a7.tar.gz
libgcc: use the new recipe (rather than gcc-runtime) to install libgcc_s.so* and crt*.o
Currently gcc-runtime installs the files, but actually gcc-runtime's do_configure checks if the files are available, so before we build gcc-runtime, we should have some recipe install the files first! -- currently gcc-cross-intermediate actually does that(gcc-cross also installs the files, but it installs into the gcc-build-internal* directory), but gcc-cross-intermediate will have its own sysroot in future, after that, gcc-runtime won't build. So let us add this new target recipe and move the installation of the files from gcc-runtime into it. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-configure-runtime.inc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-runtime.inc16
1 files changed, 1 insertions, 15 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index f9ad61d129..6cc11e2ffe 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -31,28 +31,14 @@ do_compile () {
31} 31}
32 32
33do_install () { 33do_install () {
34 target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##`
35
36 # Install libgcc from our gcc-cross saved data
37 install -d ${D}${base_libdir} ${D}${libdir}
38 cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${D}
39
40 for d in ${RUNTIMETARGET}; do 34 for d in ${RUNTIMETARGET}; do
41 cd ${B}/$d/ 35 cd ${B}/$d/
42 oe_runmake 'DESTDIR=${D}' install 36 oe_runmake 'DESTDIR=${D}' install
43 done 37 done
44
45 # Move libgcc_s into /lib
46 mkdir -p ${D}${base_libdir}
47 if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
48 mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
49 else
50 mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
51 fi
52} 38}
53 39
54INHIBIT_DEFAULT_DEPS = "1" 40INHIBIT_DEFAULT_DEPS = "1"
55DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" 41DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc"
56PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" 42PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
57 43
58BBCLASSEXTEND = "nativesdk" 44BBCLASSEXTEND = "nativesdk"