From 442d123181796a81a5a6e8c1ae6ffd24fca23740 Mon Sep 17 00:00:00 2001 From: fangting Date: Mon, 2 Sep 2024 09:20:11 +0800 Subject: [PATCH 1/3] fix codecheck Issue:#IANZ9N Signed-off-by: fangting --- build/toolchain/mac/linker_driver.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/toolchain/mac/linker_driver.py b/build/toolchain/mac/linker_driver.py index d0b344e4..7e11c923 100755 --- a/build/toolchain/mac/linker_driver.py +++ b/build/toolchain/mac/linker_driver.py @@ -55,11 +55,11 @@ def main(args): if len(args) < 2: raise RuntimeError("Usage: linker_driver.py [linker-invocation]") - for i in range(len(args)): - if args[i] != '--developer_dir': + for x in range(len(args)): + if args[x] != '--developer_dir': continue - os.environ['DEVELOPER_DIR'] = args[i + 1] - del args[i:i + 2] + os.environ['DEVELOPER_DIR'] = args[x + 1] + del args[x:x + 2] break # Collect arguments to the linker driver (this script) and remove them from -- Gitee From c192aaadc70b67f5fb4dc252437d9da22c59ea16 Mon Sep 17 00:00:00 2001 From: fangting Date: Mon, 30 Sep 2024 01:27:52 +0000 Subject: [PATCH 2/3] update toolchain.gni. Signed-off-by: fangting --- toolchain.gni | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain.gni b/toolchain.gni index 79120744..d6ca9a38 100644 --- a/toolchain.gni +++ b/toolchain.gni @@ -13,5 +13,6 @@ import("toolchain_config.gni") + toolchain_root = "//arkcompiler/toolchain" toolchain_output_path = "toolchain/toolchain" -- Gitee From 1093d9c38479e372a86306502f13bf720503ae9a Mon Sep 17 00:00:00 2001 From: fangting Date: Thu, 10 Oct 2024 11:37:15 +0800 Subject: [PATCH 3/3] all_dependent_config change to public config Signed-off-by: fangting --- build/third_party_gn/bounds_checking_function/BUILD.gn | 2 +- toolchain.gni | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/third_party_gn/bounds_checking_function/BUILD.gn b/build/third_party_gn/bounds_checking_function/BUILD.gn index bdf5b564..24013d17 100644 --- a/build/third_party_gn/bounds_checking_function/BUILD.gn +++ b/build/third_party_gn/bounds_checking_function/BUILD.gn @@ -39,7 +39,7 @@ SEC_SHARED_PART_NAME = "bounds_checking_function" ohos_shared_library("libsec_shared") { stack_protector_ret = false sources = libsec_sources - all_dependent_configs = [ ":libsec_public_config" ] + public_configs = [ ":libsec_public_config" ] cflags = [ "-D_INC_STRING_S", "-D_INC_WCHAR_S", diff --git a/toolchain.gni b/toolchain.gni index d6ca9a38..79120744 100644 --- a/toolchain.gni +++ b/toolchain.gni @@ -13,6 +13,5 @@ import("toolchain_config.gni") - toolchain_root = "//arkcompiler/toolchain" toolchain_output_path = "toolchain/toolchain" -- Gitee