diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:34:07 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:34:07 +0000 |
| commit | 2f8521c6d1173dd650d9ae2bba8c18e690fa3b1f (patch) | |
| tree | 06bc2b997b60797bc42f696f3427f92890089d2b /packages/gcc/gcc-package-cross.inc | |
| parent | 0d0bf315513039bd8560ac91865c7174e789d675 (diff) | |
| parent | 6e90aae26efa66553063b74b9afa9563b70fb982 (diff) | |
merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'
and '6ab53da82d157971966f5a17d0c29d54df22cac9'
Diffstat (limited to 'packages/gcc/gcc-package-cross.inc')
| -rw-r--r-- | packages/gcc/gcc-package-cross.inc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index a7a4908120..fa1b1247f5 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -1,8 +1,6 @@ # Packages emitted by our gcc-cross builds. # INHIBIT_PACKAGE_STRIP ?= "" -HAS_G2C ?= "yes" -HAS_GFORTRAN ?= "no" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" @@ -53,12 +51,8 @@ do_install () { # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr mkdir -p ${D}${target_libdir} mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} - if [ "${HAS_G2C}" = "yes" ]; then - mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true - fi - if [ "${HAS_GFORTRAN}" = "yes" ]; then - mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} - fi + mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true # Manually run the target stripper since we won't get it run by # the packaging. @@ -66,5 +60,6 @@ do_install () { ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* - fi + ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true + fi } |