openharmony/arkcompiler_toolchain
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_toolchain synced 2024-11-27 01:31:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!821 [Bug]: [OpenHarmony-5.0-Release] Fix the musl feature configured in part_config

Browse Source 
Merge pull request !821 from HsuYao/cherry-pick-1724115320
This commit is contained in:
openharmony_ci 2024-09-10 06:22:22 +00:00 committed by Gitee
commit 5d162d2f98
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/third_party_gn/musl/BUILD.gn
View File

@ -162,7 +162,7 @@ action("create_syscall_h_file") {
}
uapi_from = "local"
uapi_full_path = rebase_path(uapi_dir)
uapi_full_path = rebase_path(musl_uapi_dir)
arguments_uapi = [ "-c" ]
# exclude these files because they need special treatment
@ -179,7 +179,7 @@ uspi_files = exec_script("/bin/sh", arguments_uapi, "list lines")
# Generate a copy target for each file
foreach(file, uspi_files) {
copy("copy_uapi_${file}") {
sources = [ "${uapi_dir}/${file}" ]
sources = [ "${musl_uapi_dir}/${file}" ]
outputs = [ "${target_out_dir}/${musl_inc_out_dir}/${file}" ]
}
}
@ -188,7 +188,7 @@ group("copy_uapi_scsi") {
deps = []
sources = []
outputs = []
uapi_scsi_dir = rebase_path("${uapi_dir}/scsi")
uapi_scsi_dir = rebase_path("${musl_uapi_dir}/scsi")
arguments_scsi = [ "-c" ]
arguments_scsi += [ "ls ${uapi_scsi_dir}" ]
uapi_scsi_files = exec_script("/bin/sh", arguments_scsi, "list lines")
@ -196,7 +196,7 @@ group("copy_uapi_scsi") {
# Generate a copy target for each file in scsi dir to avoid being influenced by musl_copy_inc_scsi output
foreach(file, uapi_scsi_files) {
copy("copy_uapi_scsi_${file}") {
sources += [ "${uapi_dir}/scsi/${file}" ]
sources += [ "${musl_uapi_dir}/scsi/${file}" ]
outputs += [ "${target_out_dir}/${musl_inc_out_dir}/scsi/${file}" ]
}
deps += [ ":copy_uapi_scsi_${file}" ]
@ -210,9 +210,9 @@ copy("copy_uapi_asm") {
} else { # aarch64 and x86_64 use same file
file_name = "asm-arm64"
}
sources = [ "${uapi_dir}/${file_name}/asm" ]
sources = [ "${musl_uapi_dir}/${file_name}/asm" ]
} else {
sources = [ "${uapi_dir}/asm" ]
sources = [ "${musl_uapi_dir}/asm" ]
}
outputs = [ "${target_out_dir}/${musl_inc_out_dir}/asm" ]
}

4
build/third_party_gn/musl/musl_config.gni
View File

@ -45,10 +45,10 @@ declare_args() {
declare_args() {
runtime_lib_path =
"//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/15.0.4/lib"
use_jemalloc = false
musl_use_jemalloc = false
musl_ported_dir = "intermidiates/${musl_target_os}/musl_src_ported"
musl_inc_out_dir = "usr/include/${musl_target_triple}"
uapi_dir = "//kernel/linux/patches/linux-5.10/prebuilts/usr/include"
musl_uapi_dir = "//kernel/linux/patches/linux-5.10/prebuilts/usr/include"
musl_dir = "//third_party/musl"
musl_porting_dir = "//third_party/musl/porting/linux/user"
}