diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/rust/rust.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 47b76e725d..7d1f5347ea 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc | |||
| @@ -20,8 +20,6 @@ export FORCE_CRATE_HASH="${BB_TASKHASH}" | |||
| 20 | RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" | 20 | RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" |
| 21 | RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config" | 21 | RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config" |
| 22 | 22 | ||
| 23 | export YOCTO_ALTERNATE_MULTILIB_NAME = "/${BASELIB}" | ||
| 24 | |||
| 25 | # We don't want to use bitbakes vendoring because the rust sources do their | 23 | # We don't want to use bitbakes vendoring because the rust sources do their |
| 26 | # own vendoring. | 24 | # own vendoring. |
| 27 | CARGO_DISABLE_BITBAKE_VENDORING = "1" | 25 | CARGO_DISABLE_BITBAKE_VENDORING = "1" |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index f02ef2dc2b..7e46fd9c15 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
| @@ -56,7 +56,6 @@ ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan" | |||
| 56 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" | 56 | PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" |
| 57 | 57 | ||
| 58 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config" | 58 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config" |
| 59 | export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" | ||
| 60 | export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}" | 59 | export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}" |
| 61 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" | 60 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" |
| 62 | 61 | ||
