diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 92aa944b916..7e5baecd1a3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -368,7 +368,7 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/sysroots" COMPONENTS_DIR = "${STAGING_DIR}-components" -RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot" +RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native" STAGING_DIR_NATIVE = "${RECIPE_SYSROOT_NATIVE}" diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index e74dec81a89..fd6a86820b5 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -6,10 +6,6 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" MULTILIBS ??= "multilib:lib32" -STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" -STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" -RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" - INHERIT += "multilib_global" BBCLASSEXTEND_append = " ${MULTILIBS}" |