mirror of
https://github.com/lingble/meta-tegra.git
synced 2025-10-29 11:32:30 +00:00
meta: switch from virtual/XXX-gcc to virtual/cross-XXX
OE-Core master has udpated how the toolchain virtual providers are handled, so update the layer accordingly. This affects the gcc-for-nvcc extra toolchain build we have for CUDA builds, and a few other recipes that have some explicit references to the old toolchain virtual/<something> names. Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
@@ -11,7 +11,8 @@ CVE_PRODUCT = "gcc"
|
||||
inherit autotools gettext texinfo
|
||||
|
||||
BPN = "gcc"
|
||||
COMPILERDEP = "virtual/${TARGET_PREFIX}cuda-gcc:do_gcc_stash_builddir"
|
||||
COMPILERDEP = "${MLPREFIX}gcc-for-nvcc-cross-${TARGET_ARCH}:do_gcc_stash_builddir"
|
||||
COMPILERDEP:class-nativesdk = "gcc-for-nvcc-crosssdk-${SDK_SYS}:do_gcc_stash_builddir"
|
||||
|
||||
python extract_stashed_builddir () {
|
||||
src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-for-nvcc-stashed-builddir-${TARGET_SYS}")
|
||||
|
||||
@@ -3,7 +3,7 @@ inherit cross-canadian
|
||||
SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)"
|
||||
PN = "gcc-for-nvcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
|
||||
DEPENDS = "virtual/nativesdk-cross-cc virtual/cross-cc virtual/nativesdk-cross-binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
|
||||
|
||||
GCCMULTILIB = "--enable-multilib"
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ inherit cross
|
||||
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
EXTRADEPENDS = ""
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
|
||||
PROVIDES = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++"
|
||||
DEPENDS = "virtual/cross-binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
|
||||
PROVIDES = "virtual/cross-cuda-gcc virtual/cross-cuda-g++"
|
||||
python () {
|
||||
if d.getVar("TARGET_OS").startswith("linux"):
|
||||
d.setVar("EXTRADEPENDS", "linux-libc-headers")
|
||||
|
||||
@@ -8,5 +8,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
||||
|
||||
GCCMULTILIB = "--disable-multilib"
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
|
||||
PROVIDES = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++"
|
||||
DEPENDS = "virtual/nativesdk-cross-binutils gettext-native ${NATIVEDEPS}"
|
||||
PROVIDES = "virtual/nativesdk-cross-cuda-gcc virtual/nativesdk-cross-cuda-g++"
|
||||
|
||||
@@ -147,7 +147,8 @@ do_install:append:class-target () {
|
||||
}
|
||||
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++ libgcc-for-nvcc libgcc virtual/${MLPREFIX}libc"
|
||||
DEPENDS = "virtual/cross-cuda-gcc virtual/cross-cuda-g++ libgcc-for-nvcc libgcc virtual/${MLPREFIX}libc"
|
||||
DEPENDS:class-nativesdk = "virtual/nativesdk-cross-cuda-gcc virtual/nativesdk-cross-cuda-g++ ${MLPREFIX}libgcc-for-nvcc ${MLPREFIX}libgcc virtual/${MLPREFIX}/libc"
|
||||
STAGING_BINDIR_TOOLCHAIN:append = "-${BINV}"
|
||||
|
||||
BBCLASSEXTEND = "nativesdk"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
GCCMULTILIB = "--enable-multilib"
|
||||
require gcc-for-nvcc-configure-common.inc
|
||||
|
||||
DEPENDS += "virtual/${TARGET_PREFIX}cuda-gcc"
|
||||
DEPENDS += "virtual/cross-cuda-gcc"
|
||||
|
||||
EXTRA_OECONF_PATHS = "\
|
||||
--with-build-sysroot=${STAGING_DIR_TARGET} \
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
require libgcc-for-nvcc-common.inc
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}gcc"
|
||||
DEPENDS = "virtual/cross-cc"
|
||||
|
||||
LICENSE = "GPL-3.0-with-GCC-exception"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require libgcc-for-nvcc-common.inc
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++ virtual/${MLPREFIX}libc"
|
||||
DEPENDS = "virtual/cross-cuda-gcc virtual/cross-cuda-g++ virtual/${MLPREFIX}libc"
|
||||
STAGING_BINDIR_TOOLCHAIN:append = "-${BINV}"
|
||||
|
||||
do_install:append:class-target () {
|
||||
|
||||
Reference in New Issue
Block a user