From 4e12991e8918e0b8aaeb0f06fe5686705eb5fbcd Mon Sep 17 00:00:00 2001
From: Robert Drab <robert.drab@huawei.com>
Date: Wed, 22 Sep 2021 12:12:48 +0200
Subject: [PATCH] gn.bbclass: Defer return from a function until bbfatal
It is preferable to allow checker function to run until bbfatal is executed
for a meaningful error message to be printed for a better user experience.
Signed-off-by: Robert Drab <robert.drab@huawei.com>
---
meta-ohos-staging/classes/gn.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-ohos-staging/classes/gn.bbclass b/meta-ohos-staging/classes/gn.bbclass
index ba38dd63..3892de53 100644
--- a/meta-ohos-staging/classes/gn.bbclass
+++ b/meta-ohos-staging/classes/gn.bbclass
@@ -95,9 +95,9 @@ addtask write_gn_toolchain_file after do_patch before do_configure
do_check_yocto_toolchain_is_used() {
cd "${S}"
DEFAULT_TARGET_TOOLCHAIN=$(gn desc ${B} "//build/toolchain/yocto:yocto_flags" | \
- grep "toolchain: //build/toolchain/yocto:yocto_target")
+ grep "toolchain: //build/toolchain/yocto:yocto_target") || true
LIST_OF_GN_TARGETS_USING_YOCTO_FLAGS=$(gn refs -q ${B} \
- "//build/toolchain/yocto:yocto_flags")
+ "//build/toolchain/yocto:yocto_flags") || true
if test -z "$DEFAULT_TARGET_TOOLCHAIN" || \
test -z "$LIST_OF_GN_TARGETS_USING_YOCTO_FLAGS"
then
--
GitLab