classes/conf: Update to handle gcc-runtime
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
cdaf6c804b
commit
847324b79b
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue