diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-17 12:22:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:08 +0000 |
commit | 11d9127ac57514394f8297f9fdfc7b31e163fcb8 (patch) | |
tree | 3a9e5c58b4d0da2a0facf72e8073a000417bc121 /meta/recipes-devtools | |
parent | 52bc1c3dd72916dccf82c7ff1eb8fda9d2d12fc3 (diff) | |
download | poky-11d9127ac57514394f8297f9fdfc7b31e163fcb8.tar.gz |
cross-canadian: Handle powerpc linux verses linux-gnuspe
PowerPC toolchains can use the OS "linux" or "linux-gnuspe". This
patch links them together so the one cross-canadian toolchain can support
both.
GCC_FOR_TARGET is set for the GCC recipe as otherwise configure
can pick up an incorrect value.
[YOCTO #5354]
(From OE-Core master rev: a1d6331238982b0c5d39b0a18794f6654b00d46a)
(From OE-Core rev: b114b045687776ebc5c805e1f19758e7e37eebf2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index 2da9017661..81349c083c 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc | |||
@@ -22,6 +22,8 @@ do_install () { | |||
22 | rm -f ${D}${libdir}/libiberty* | 22 | rm -f ${D}${libdir}/libiberty* |
23 | rm -f ${D}${libdir}/libopcodes* | 23 | rm -f ${D}${libdir}/libopcodes* |
24 | rm -f ${D}${includedir}/*.h | 24 | rm -f ${D}${includedir}/*.h |
25 | |||
26 | cross_canadian_bindirlinks | ||
25 | } | 27 | } |
26 | 28 | ||
27 | BBCLASSEXTEND = "" | 29 | BBCLASSEXTEND = "" |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 64bb6ba722..900f1e594f 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc | |||
@@ -29,6 +29,7 @@ export AS_FOR_TARGET = "${TARGET_PREFIX}as" | |||
29 | export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool" | 29 | export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool" |
30 | export CC_FOR_TARGET = "${TARGET_PREFIX}gcc" | 30 | export CC_FOR_TARGET = "${TARGET_PREFIX}gcc" |
31 | export CXX_FOR_TARGET = "${TARGET_PREFIX}g++" | 31 | export CXX_FOR_TARGET = "${TARGET_PREFIX}g++" |
32 | export GCC_FOR_TARGET = "${TARGET_PREFIX}gcc" | ||
32 | export LD_FOR_TARGET = "${TARGET_PREFIX}ld" | 33 | export LD_FOR_TARGET = "${TARGET_PREFIX}ld" |
33 | export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo" | 34 | export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo" |
34 | export NM_FOR_TARGET = "${TARGET_PREFIX}nm" | 35 | export NM_FOR_TARGET = "${TARGET_PREFIX}nm" |
@@ -69,7 +70,7 @@ EXCLUDE_FROM_SHLIBS = "1" | |||
69 | PACKAGES = "${PN} ${PN}-doc" | 70 | PACKAGES = "${PN} ${PN}-doc" |
70 | 71 | ||
71 | FILES_${PN} = "\ | 72 | FILES_${PN} = "\ |
72 | ${bindir}/* \ | 73 | ${exec_prefix}/bin/* \ |
73 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ | 74 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ |
74 | ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ | 75 | ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ |
75 | ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ | 76 | ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ |
@@ -137,6 +138,8 @@ do_install () { | |||
137 | done | 138 | done |
138 | 139 | ||
139 | chown -R root:root ${D} | 140 | chown -R root:root ${D} |
141 | |||
142 | cross_canadian_bindirlinks | ||
140 | } | 143 | } |
141 | 144 | ||
142 | ELFUTILS = "nativesdk-elfutils" | 145 | ELFUTILS = "nativesdk-elfutils" |
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 3cb347b4c5..653f52baaf 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc | |||
@@ -31,5 +31,6 @@ EOF | |||
31 | # right bits installed by binutils. | 31 | # right bits installed by binutils. |
32 | do_install_append() { | 32 | do_install_append() { |
33 | rm -rf ${D}${exec_prefix}/lib | 33 | rm -rf ${D}${exec_prefix}/lib |
34 | cross_canadian_bindirlinks | ||
34 | } | 35 | } |
35 | 36 | ||