diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-03 20:04:33 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-03 20:04:33 +0100 |
| commit | ec8f5299d96d938b56c68d4ffa701b0c8a061de6 (patch) | |
| tree | ad27e2213266eb3b425a36f5c6f990c78938ba35 /meta/packages/gcc | |
| parent | b3e41b5d1ec003908610a79648528246d467a053 (diff) | |
| download | openembedded-core-ec8f5299d96d938b56c68d4ffa701b0c8a061de6.tar.gz openembedded-core-ec8f5299d96d938b56c68d4ffa701b0c8a061de6.tar.bz2 openembedded-core-ec8f5299d96d938b56c68d4ffa701b0c8a061de6.zip | |
cross-canadian: Move binaries into a subdirectory of bin to allow multimachine installs and update users accordingly
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/gcc')
| -rw-r--r-- | meta/packages/gcc/gcc-cross-canadian_4.3.3.bb | 2 | ||||
| -rw-r--r-- | meta/packages/gcc/gcc-package-sdk.inc | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb index 7cc202363e..981452b7a7 100644 --- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb +++ b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r16" +PR = "r17" DEPENDS += "gmp-nativesdk mpfr-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk" diff --git a/meta/packages/gcc/gcc-package-sdk.inc b/meta/packages/gcc/gcc-package-sdk.inc index cdce1da1c7..23b9a48eb3 100644 --- a/meta/packages/gcc/gcc-package-sdk.inc +++ b/meta/packages/gcc/gcc-package-sdk.inc @@ -7,10 +7,7 @@ PACKAGES = "${PN} ${PN}-doc" FILES_${PN} = "\ ${bindir}/* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \ @@ -44,11 +41,12 @@ do_install () { rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a rm -f ${D}${libdir}/libiberty.a - # Create the ${prefix}/${TARGET_SYS}/bin/* symlinks - install -d ${D}${prefix}/${TARGET_SYS}/bin/ - for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are + # found. + dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/ + install -d $dest + for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do + ln -sf ${bindir}/${TARGET_PREFIX}$t $dest$t done - ln -sf "${bindir}/${TARGET_PREFIX}gcc" "${D}${prefix}/${TARGET_SYS}/bin/cc" } |