diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-08 20:33:16 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-08 20:33:16 +0100 |
commit | f47eeddbd692ac3c6109c18c9f04a3ad4dc789ba (patch) | |
tree | abe9f2ef67deb85c5cde312123b53aac4daaf225 /meta/packages/gcc/gcc-package-cross.inc | |
parent | d579b7c746b7113d5a4867b851ed2dc7733299a8 (diff) | |
download | poky-f47eeddbd692ac3c6109c18c9f04a3ad4dc789ba.tar.gz |
gcc-runtime: Various bug fixes
* Use the -nostdinc++ to CXX fixing libstdc++
* Generate libgcc in gcc-cross, save the result and use in gcc-runtime
* Fix the layout of the crt*.o files so the SDK compiler can find them
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/gcc/gcc-package-cross.inc')
-rw-r--r-- | meta/packages/gcc/gcc-package-cross.inc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc index 999925a6fa..8a170d083b 100644 --- a/meta/packages/gcc/gcc-package-cross.inc +++ b/meta/packages/gcc/gcc-package-cross.inc | |||
@@ -16,18 +16,21 @@ do_install () { | |||
16 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d | 16 | rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d |
17 | done | 17 | done |
18 | 18 | ||
19 | # gcc-runtime requires some headers, we stash them here | 19 | # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build |
20 | if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then | 20 | if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then |
21 | install -d ${D}${includedir}/gcc-build-internal-${TARGET_SYS} | 21 | dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS} |
22 | for f in *.h *.c libgcc.mvars; do | 22 | oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc |
23 | cp ${B}/gcc/$f ${D}${includedir}/gcc-build-internal-${TARGET_SYS}/ | 23 | |
24 | done | 24 | # Ideally here we'd override the libgcc Makefile's idea of slibdir but |
25 | # Special for PowerPC (and possibly others) | 25 | # for now, we just move the files to the correct location |
26 | if [ -f ${B}/gcc/tramp.S ]; then | 26 | |
27 | cp ${B}/gcc/*.S ${D}${includedir}/gcc-build-internal-${TARGET_SYS}/ | 27 | install -d $dest${target_base_libdir} |
28 | fi | 28 | mv $dest${target_exec_prefix}/${TARGET_SYS}/lib*/* $dest${target_base_libdir} |
29 | if [ -f libgcc.mvars]; then | 29 | rm -rf $dest${target_exec_prefix}/${TARGET_SYS} |
30 | cp ${B}/gcc/libgcc.mvars ${D}${includedir}/gcc-build-internal-${TARGET_SYS}/ | 30 | |
31 | fi | 31 | # Also need to move gcc from /usr/lib/gcc/* to /usr/lib/ else the search paths won't find the crt*.o files |
32 | |||
33 | mv $dest${target_libdir}/gcc/* $dest${target_libdir}/ | ||
34 | rmdir $dest${target_libdir}/gcc | ||
32 | fi | 35 | fi |
33 | } | 36 | } |