diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-01-25 15:21:55 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2013-01-25 15:21:55 +0100 |
| commit | 81cff500819d2e001e6bdeab7e0b668588571473 (patch) | |
| tree | c738ee6299b5607868c2e2a8337c7827dc4787fe | |
| parent | b477c2477fe4368f6720ee4f2f82c72bde597496 (diff) | |
external-linaro-toolchain: handle both Linaro AArch64 and ARMHF cross toolchains
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
| -rw-r--r-- | recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index e9647682..83a85324 100644 --- a/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -41,13 +41,23 @@ do_install() { install -d ${D}${includedir} cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/lib/* ${D}${base_libdir} - cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/lib/${ELT_TARGET_SYS}/* ${D}${base_libdir} - cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/lib/${ELT_TARGET_SYS}/* ${D}${libdir} + if [ -d ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/lib/${ELT_TARGET_SYS} ]; then + cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/lib/${ELT_TARGET_SYS}/* ${D}${base_libdir} + else + cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/lib/* ${D}${base_libdir} + fi + if [ -d ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/lib/${ELT_TARGET_SYS} ]; then + cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/lib/${ELT_TARGET_SYS}/* ${D}${libdir} + else + cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/lib/* ${D}${libdir} + fi cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/share/* ${D}${datadir} cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/* ${D}${includedir} - cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/${ELT_TARGET_SYS}/* ${D}${includedir} + if [ -d ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/${ELT_TARGET_SYS} ]; then + cp -a ${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/libc/usr/include/${ELT_TARGET_SYS}/* ${D}${includedir} - rm -r ${D}${includedir}/${ELT_TARGET_SYS} + rm -r ${D}${includedir}/${ELT_TARGET_SYS} + fi # fix up the copied symlinks (they are still pointing to the multiarch directory) ln -sf ld-2.13.so ${D}${base_libdir}/ld-linux.so.3 @@ -69,8 +79,18 @@ do_install() { ln -sf ../../lib/libnss_nisplus.so.2 ${D}${libdir}/libnss_nisplus.so ln -sf ../../lib/libm.so.6 ${D}${libdir}/libm.so - sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libc.so - sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libpthread.so + if [ -f ${D}${libdir}/libc.so ];then + sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libc.so + fi + if [ -f ${D}${base_libdir}/libc.so ];then + sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${base_libdir}/libc.so + fi + if [ -f ${D}${libdir}/libpthread.so ];then + sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${libdir}/libpthread.so + fi + if [ -f ${D}${base_libdir}/libpthread.so ];then + sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" ${D}${base_libdir}/libpthread.so + fi } PACKAGES =+ "\ |