gcc: Make sure target_* variables are set, fixing gcc search path issues

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

6 files changed, 9 insertions, 5 deletions

diff --git a/meta/packages/gcc/gcc-common.inc b/meta/packages/gcc/gcc-common.inc
index 73bc327507..c482826aa0 100644
--- a/meta/packages/gcc/gcc-common.inc
+++ b/meta/packages/gcc/gcc-common.inc
@@ -33,3 +33,7 @@ BINV = "${PV}"
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
+target_includedir ?= "${includedir}"
+target_libdir ?= "${libdir}"
+target_base_libdir ?= "${base_libdir}"
+target_prefix ?= "${prefix}"
diff --git a/meta/packages/gcc/gcc_3.4.4.bb b/meta/packages/gcc/gcc_3.4.4.bb
index 7ec84b6012..5bc3761068 100644
--- a/meta/packages/gcc/gcc_3.4.4.bb
+++ b/meta/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/meta/packages/gcc/gcc_4.1.2.bb b/meta/packages/gcc/gcc_4.1.2.bb
index da1ecb9b17..dd88ccdc27 100644
--- a/meta/packages/gcc/gcc_4.1.2.bb
+++ b/meta/packages/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/meta/packages/gcc/gcc_4.2.3.bb b/meta/packages/gcc/gcc_4.2.3.bb
index 7238aed4d7..556fc74267 100644
--- a/meta/packages/gcc/gcc_4.2.3.bb
+++ b/meta/packages/gcc/gcc_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/meta/packages/gcc/gcc_4.3.1.bb b/meta/packages/gcc/gcc_4.3.1.bb
index 318ccd3775..c51d537d2d 100644
--- a/meta/packages/gcc/gcc_4.3.1.bb
+++ b/meta/packages/gcc/gcc_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/meta/packages/gcc/gcc_4.3.3.bb b/meta/packages/gcc/gcc_4.3.3.bb
index 318ccd3775..c51d537d2d 100644
--- a/meta/packages/gcc/gcc_4.3.3.bb
+++ b/meta/packages/gcc/gcc_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc