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

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

diff --git a/meta/packages/gcc/gcc-common.inc b/meta/packages/gcc/gcc-common.inc
index 73bc3275078dd37bde5f72af1b28ca0686ec5ce6..c482826aa08f22d7892aa882a1d62e520dd7030d 100644 (file)
--- 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 7ec84b6012392b8c771af77355c28f6519d7b9df..5bc37610681c0c76b6d812606cda7f5e2f98504f 100644 (file)
--- 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 da1ecb9b174dc1d29979dfb2967ae4733bb5abb0..dd88ccdc27729aedd8c093b021cdadfb3a4a202b 100644 (file)
--- 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 7238aed4d702d21ca9c1e34e52221084e0d52aa9..556fc74267c6b307a9f26c98376f6d8e21982405 100644 (file)
--- 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 318ccd3775a1d6c1c7f6ef838df54fc3f1539f8c..c51d537d2d4dac1aea0da4ed950103cc190b32eb 100644 (file)
--- 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 318ccd3775a1d6c1c7f6ef838df54fc3f1539f8c..c51d537d2d4dac1aea0da4ed950103cc190b32eb 100644 (file)
--- 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