diff options
Diffstat (limited to 'packages/gcc/gcc3-cross-build.inc')
-rw-r--r-- | packages/gcc/gcc3-cross-build.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/packages/gcc/gcc3-cross-build.inc b/packages/gcc/gcc3-cross-build.inc index 611b021b11..ef3ae3a6a1 100644 --- a/packages/gcc/gcc3-cross-build.inc +++ b/packages/gcc/gcc3-cross-build.inc @@ -53,27 +53,27 @@ 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. if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* + ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* fi } |