未验证 提交 bd864ea8 编写于 作者: O openharmony_ci 提交者: Gitee

!939 refactor: sysroot部件化

Merge pull request !939 from Zhaotianyu/cherry-pick-1658840206
...@@ -323,7 +323,7 @@ group("liteos_a") { ...@@ -323,7 +323,7 @@ group("liteos_a") {
deps += [ deps += [
":apps", ":apps",
":tests", ":tests",
"//prebuilts/lite/sysroot/build:strip", "//third_party/musl/scripts/build_lite:strip",
] ]
if (liteos_skip_make == false) { if (liteos_skip_make == false) {
deps += [ ":make" ] deps += [ ":make" ]
......
...@@ -121,7 +121,7 @@ sysroot: ...@@ -121,7 +121,7 @@ sysroot:
$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH)) $(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
ifeq ($(origin SYSROOT_PATH),file) ifeq ($(origin SYSROOT_PATH),file)
$(HIDE)mkdir -p $(SYSROOT_PATH)/build && cd $(SYSROOT_PATH)/build && \ $(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 \ $(MAKE) TARGETS=liteos_a_user \
ARCH=$(ARCH) \ ARCH=$(ARCH) \
TARGET=$(LOSCFG_LLVM_TARGET) \ TARGET=$(LOSCFG_LLVM_TARGET) \
......
...@@ -42,7 +42,7 @@ copy("copy_mksh_src") { ...@@ -42,7 +42,7 @@ copy("copy_mksh_src") {
build_ext_component("build_mksh") { build_ext_component("build_mksh") {
deps = [ ":copy_mksh_src" ] deps = [ ":copy_mksh_src" ]
deps += [ "//prebuilts/lite/sysroot" ] deps += [ "//third_party/musl:sysroot_lite" ]
exec_path = rebase_path("$target_out_dir/mksh_build") exec_path = rebase_path("$target_out_dir/mksh_build")
cflags = [ cflags = [
......
...@@ -51,7 +51,7 @@ build_ext_component("build_toybox") { ...@@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
":copy_toybox_config", ":copy_toybox_config",
":copy_toybox_src", ":copy_toybox_src",
] ]
deps += [ "//prebuilts/lite/sysroot" ] deps += [ "//third_party/musl:sysroot_lite" ]
exec_path = rebase_path("$target_out_dir/toybox_build") exec_path = rebase_path("$target_out_dir/toybox_build")
cflags = [ cflags = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册