diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-02-23 19:07:46 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-30 11:37:23 +0100 |
commit | f7337ee8c409761b569dab06e88d530f24b367d5 (patch) | |
tree | e3116f8ac86cbcc8641235f50a31570548825a89 /meta/recipes-devtools/gcc/gcc-package-cross.inc | |
parent | f66cc57e7282f7d278245dac0281f00e5131a934 (diff) | |
download | poky-f7337ee8c409761b569dab06e88d530f24b367d5.tar.gz |
gcc: Stash the gcc-cross builddir to reuse in libgcc and gcc-runtime
Currently we stash the libgcc install tree and then reuse that
to populate libgcc recipe later. This mechanism does not work
for gcc 4.7/trunk since now libstdc++ needs access to build tree
of libgcc. This patch stashes the gcc-cross build tree
and then reuses this in libgcc as well as in gcc-runtime
recipe builds.
Now we build libgcc in the libgcc recipe instead of just
using the prebuilt install tree
core-image-minimal build/run tested on all qemu machines
(From OE-Core rev: 7cf9f0597648c0bdaa080976d74acfbfc4c8443d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-package-cross.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-package-cross.inc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc index e32412c127..9718101a3d 100644 --- a/meta/recipes-devtools/gcc/gcc-package-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc | |||
@@ -36,19 +36,7 @@ do_install () { | |||
36 | case ${PN} in | 36 | case ${PN} in |
37 | *gcc-cross|*gcc-crosssdk) | 37 | *gcc-cross|*gcc-crosssdk) |
38 | dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS} | 38 | dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS} |
39 | oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc | 39 | cp -fpPR . $dest |
40 | |||
41 | # Ideally here we'd override the libgcc Makefile's idea of slibdir but | ||
42 | # for now, we just move the files to the correct location | ||
43 | |||
44 | install -d $dest${target_base_libdir} | ||
45 | mv $dest${target_exec_prefix}/${TARGET_SYS}/lib*/* $dest${target_base_libdir} | ||
46 | rm -rf $dest${target_exec_prefix}/${TARGET_SYS} | ||
47 | |||
48 | # Also need to move gcc from /usr/lib/gcc/* to /usr/lib/ else the search paths won't find the crt*.o files | ||
49 | |||
50 | mv $dest${target_libdir}/gcc/* $dest${target_libdir}/ | ||
51 | rmdir $dest${target_libdir}/gcc | ||
52 | ;; | 40 | ;; |
53 | esac | 41 | esac |
54 | } | 42 | } |