From e7c1633f00a3d6323a98466c7f5b4bb0d63528ad Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Sat, 16 Jul 2022 21:01:08 +0800 Subject: [PATCH] =?UTF-8?q?fixed=201568c31=20from=20https://gitee.com/arvi?= =?UTF-8?q?nzzz/kernel=5Fliteos=5Fa/pulls/934=20refactor:=20sysroot?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=20close:=20#I5HF8S?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: arvinzzz Change-Id: I727b10c3b419fc71e228f5ad92abc107e756bbac --- BUILD.gn | 2 +- Makefile | 2 +- apps/mksh/BUILD.gn | 2 +- apps/toybox/BUILD.gn | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 5c112eba..a560c5d3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -323,7 +323,7 @@ group("liteos_a") { deps += [ ":apps", ":tests", - "//prebuilts/lite/sysroot/build:strip", + "//third_party/musl/scripts/build_lite:strip", ] if (liteos_skip_make == false) { deps += [ ":make" ] diff --git a/Makefile b/Makefile index 8122156f..84a46b47 100644 --- a/Makefile +++ b/Makefile @@ -121,7 +121,7 @@ sysroot: $(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH)) ifeq ($(origin SYSROOT_PATH),file) $(HIDE)mkdir -p $(SYSROOT_PATH)/build && cd $(SYSROOT_PATH)/build && \ - ln -snf $(LITEOSTOPDIR)/../../prebuilts/lite/sysroot/build/Makefile && \ + ln -snf $(LITEOSTOPDIR)/../../third_party/musl/scripts/build_lite/Makefile && \ $(MAKE) TARGETS=liteos_a_user \ ARCH=$(ARCH) \ TARGET=$(LOSCFG_LLVM_TARGET) \ diff --git a/apps/mksh/BUILD.gn b/apps/mksh/BUILD.gn index 379d78f0..5ae70887 100644 --- a/apps/mksh/BUILD.gn +++ b/apps/mksh/BUILD.gn @@ -42,7 +42,7 @@ copy("copy_mksh_src") { build_ext_component("build_mksh") { deps = [ ":copy_mksh_src" ] - deps += [ "//prebuilts/lite/sysroot" ] + deps += [ "//third_party/musl:sysroot_lite" ] exec_path = rebase_path("$target_out_dir/mksh_build") cflags = [ diff --git a/apps/toybox/BUILD.gn b/apps/toybox/BUILD.gn index a6d74a10..61e765ae 100644 --- a/apps/toybox/BUILD.gn +++ b/apps/toybox/BUILD.gn @@ -51,7 +51,7 @@ build_ext_component("build_toybox") { ":copy_toybox_config", ":copy_toybox_src", ] - deps += [ "//prebuilts/lite/sysroot" ] + deps += [ "//third_party/musl:sysroot_lite" ] exec_path = rebase_path("$target_out_dir/toybox_build") cflags = [ -- GitLab