4 files changed, 4 insertions, 3 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 51a514570b..4e8ae127a7 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -28,7 +28,7 @@ def base_dep_prepend(d):
         if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
                 if (bb.data.getVar('HOST_SYS', d, 1) !=
                     bb.data.getVar('BUILD_SYS', d, 1)):
-                        deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
+                        deps += " virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc "
         return deps
 
 
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 913d88de64..d8cc679283 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -500,7 +500,7 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
         if "configure.in" in files:
             configs.append(os.path.join(root, "configure.in"))
 
-    if "gettext" not in bb.data.getVar('P', d, True):
+    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True):
        if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
           gt = "gettext-native"
        elif bb.data.inherits_class('cross-canadian', d):
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 75f5790121..95ffc064af 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -62,7 +62,7 @@ python __anonymous () {
     for dep in deps:
         if dep.endswith("-native") or dep.endswith("-cross"):
             newdeps.append(dep)
-        elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc"):
+        elif dep.endswith("-gcc-intermediate") or dep.endswith("-gcc-initial") or dep.endswith("-gcc") or dep.endswith("-g++"):
             newdeps.append(dep + "-crosssdk")
         elif not dep.endswith("-nativesdk"):
             newdeps.append(dep + "-nativesdk")
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index f5882a278c..e0d42c6823 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
 
 GCCVERSION ?= "4.3.3"
 BINUVERSION ?= "2.20"