diff options
Diffstat (limited to 'packages/gcc-snapshot')
| -rw-r--r-- | packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb | 22 | ||||
| -rw-r--r-- | packages/gcc-snapshot/gcc-snapshot_cvs.bb | 20 |
2 files changed, 21 insertions, 21 deletions
diff --git a/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb b/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb index d92b09f2b3..4e2f7fa91b 100644 --- a/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb +++ b/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb @@ -69,25 +69,25 @@ do_install () { oe_runmake 'DESTDIR=${D}' install # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} - if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then + mkdir -p ${D}${base_libdir} + if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then # Already in the right location : - elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then - mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir} + elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then + mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} else - mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir} + mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} fi # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` - mkdir -p ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR} - mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR} + mkdir -p ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} + mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} # Manually run the target stripper since we won't get it run by # the packaging. - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}/${base_libdir}gcc_s.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}gcc_s.so.* } diff --git a/packages/gcc-snapshot/gcc-snapshot_cvs.bb b/packages/gcc-snapshot/gcc-snapshot_cvs.bb index f7c1a0ec09..bf87651e75 100644 --- a/packages/gcc-snapshot/gcc-snapshot_cvs.bb +++ b/packages/gcc-snapshot/gcc-snapshot_cvs.bb @@ -167,28 +167,28 @@ do_install () { autotools_do_install # Cleanup some of the ${libdir}{,exec}/gcc stuff ... - rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools - rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools + rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools + rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools # Move libgcc_s into /lib - mkdir -p ${D}/${base_libdir} - mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir} - rm ${D}/${libdir}/libgcc_s.so + mkdir -p ${D}${base_libdir} + mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} + rm ${D}${libdir}/libgcc_s.so ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \ | tr -s / \ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \ - ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so + ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so # We don't need libtool libraries - rm ${D}/${libdir}/libg2c.la + rm ${D}${libdir}/libg2c.la # Cleanup manpages.. - rm -r ${D}/${mandir}/man7 + rm -r ${D}${mandir}/man7 # We use libiberty from binutils - rm ${D}/${libdir}/libiberty.a + rm ${D}${libdir}/libiberty.a - cd ${D}/${bindir} + cd ${D}${bindir} # We care about g++ not c++ rm *c++ |