summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-20 15:56:35 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-05 14:56:37 +0000
commit8f7bba3812698b620b3cabd6e2c1472f5eed7597 (patch)
treedc07212e6992465dcc48db25194ea10a94012b9b
parent3a92d518b407041fe45fc3401bbddb279fb1b7fd (diff)
downloadpoky-8f7bba3812698b620b3cabd6e2c1472f5eed7597.tar.gz
poky-8f7bba3812698b620b3cabd6e2c1472f5eed7597.tar.bz2
poky-8f7bba3812698b620b3cabd6e2c1472f5eed7597.zip
gcc-cross-canadian: Fix include paths and hence c++ compiler issues
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/cross-canadian.bbclass8
-rw-r--r--meta/packages/gcc/gcc-cross-canadian_4.3.3.bb2
2 files changed, 9 insertions, 1 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index bd738ecd4d..9b6bfa0143 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -31,6 +31,14 @@ CFLAGS = "${BUILDSDK_CFLAGS}"
CXXFLAGS = "${BUILDSDK_CFLAGS}"
LDFLAGS = "${BUILDSDK_LDFLAGS}"
+# Path mangling needed by the cross packaging
+# Note that we use := here to ensure that libdir and includedir are
+# target paths, not CROSS_DIR paths.
+target_libdir := "${libdir}"
+target_includedir := "${includedir}"
+target_base_libdir := "${base_libdir}"
+target_prefix := "${prefix}"
+
# Change to place files in SDKPATH
prefix = "${SDKPATH}"
exec_prefix = "${SDKPATH}"
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
index f6e60ebf2d..f68edbeb12 100644
--- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
require gcc-configure-sdk.inc
require gcc-package-sdk.inc
-PR = "r7"
+PR = "r8"
DEPENDS += "gmp-nativesdk mpfr-nativesdk"
RDEPENDS_${PN} += "mpfr-nativesdk"