summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 16:47:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 16:47:11 +0000
commit66861cce918eb7ed1f16f829d652c9d7105152b7 (patch)
treeb3f79c525276efc4575ac631789515d59c0c71da /meta/recipes-devtools/gcc
parent39ab3f14f2755db83a2e689972038e74e39df645 (diff)
downloadpoky-66861cce918eb7ed1f16f829d652c9d7105152b7.tar.gz
Revert "gcc: Use FILESPATH instead of FILESDIR and cleanup/simplify"
This reverts commit 90616875b432a932415063b08497266e70c49d75. It was never meant to be applied as its an incorrect previous development verison of a patch in progress.
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index ffdffab2fd..1a3e09b071 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -18,6 +18,8 @@ PV = "4.7.2"
18 18
19BINV = "4.7.2" 19BINV = "4.7.2"
20 20
21FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}"
22
21DEPENDS =+ "mpfr gmp libmpc" 23DEPENDS =+ "mpfr gmp libmpc"
22NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" 24NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
23 25
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index b2a258ba77..38f3b7f959 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -7,7 +7,7 @@ NATIVEDEPS = ""
7 7
8inherit autotools gettext 8inherit autotools gettext
9 9
10FILESPATH = "${FILE_DIRNAME}/gcc-${PV}" 10FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/gcc-${PV}"
11 11
12def get_gcc_fpu_setting(bb, d): 12def get_gcc_fpu_setting(bb, d):
13 if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm": 13 if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm":