From 2822b50c04a2bd516bd66d18d4546f710b7ede3c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 15 Oct 2020 09:28:23 -0700 Subject: [PATCH] layer.conf: Add gatesgarth to LAYERSERIES_COMPAT Signed-off-by: Khem Raj --- conf/layer.conf | 2 +- recipes-devtools/rust/rust-llvm.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 2fa1ca2..7c8f99c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_rust-layer = "7" LAYERDEPENDS_rust-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_rust-layer = "rocko sumo thud warrior zeus dunfell" +LAYERSERIES_COMPAT_rust-layer = "rocko sumo thud warrior zeus dunfell gatesgarth" # Override security flags require conf/distro/include/rust_security_flags.inc diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc index 161ab1e..ff118d2 100644 --- a/recipes-devtools/rust/rust-llvm.inc +++ b/recipes-devtools/rust/rust-llvm.inc @@ -44,6 +44,8 @@ EXTRA_OECMAKE_append_class-target = "\ # provide almost no value. If you really need them then override this INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" + do_install_append_class-target() { # Disable checks on the native tools, since these should came from the native recipe sed -i -e 's/\(.*APPEND.*_IMPORT_CHECK_FILES_FOR_.*{_IMPORT_PREFIX}\/bin\/.*\)/#\1/' ${D}/usr/share/llvm/cmake/LLVMExports-noconfig.cmake