summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-03-04 16:46:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:58:44 +0000
commitbaa8b031f2640a60467652625856529d9a57c6fb (patch)
tree447c44665ea6d5f1fb149312751022b715f08f62 /meta/recipes-devtools/gcc
parentb4455d8c612df975c3f279486a29f6b5572e7f8c (diff)
downloadpoky-baa8b031f2640a60467652625856529d9a57c6fb.tar.gz
gcc-cross: don't use oe.path.relative
Instead of using oe.path.relative, use the Python Standard Library function os.path.relpath. (From OE-Core rev: 90c3a0401c566e26d89a5c0410b2a51fe27b95b2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 477f499276..8d979b1144 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -95,7 +95,7 @@ FILES_${PN}-doc = "\
95EXEEXT = "" 95EXEEXT = ""
96 96
97# Compute how to get from libexecdir to bindir in python (easier than shell) 97# Compute how to get from libexecdir to bindir in python (easier than shell)
98BINRELPATH = "${@oe.path.relative(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${bindir}"))}" 98BINRELPATH = "${@os.path.relpath(d.expand("${bindir}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
99 99
100do_install () { 100do_install () {
101 oe_runmake 'DESTDIR=${D}' install-host 101 oe_runmake 'DESTDIR=${D}' install-host
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 5c4319fb32..777c970217 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -138,7 +138,7 @@ STOP
138INHIBIT_PACKAGE_STRIP = "1" 138INHIBIT_PACKAGE_STRIP = "1"
139 139
140# Compute how to get from libexecdir to bindir in python (easier than shell) 140# Compute how to get from libexecdir to bindir in python (easier than shell)
141BINRELPATH = "${@oe.path.relative(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"))}" 141BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
142 142
143do_install () { 143do_install () {
144 oe_runmake 'DESTDIR=${D}' install-host 144 oe_runmake 'DESTDIR=${D}' install-host