提交 bdf1c4c5 编写于 作者: S surencong

modify path of jemalloc

category:bugfix
issue:https://gitee.com/openharmony/third_party_musl/issues/I7MKIU?from=project-issueSigned-off-by: Nsurencong <surencong@huawei.com>
Change-Id: I64f9c2c8dd69723d4d5946e2b60ca95230383f7b
上级 c1f2352b
...@@ -35,6 +35,7 @@ declare_args() { ...@@ -35,6 +35,7 @@ declare_args() {
"//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/12.0.1/lib" "//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/12.0.1/lib"
user_custom_libc = true user_custom_libc = true
use_jemalloc = false use_jemalloc = false
musl_malloc_plugin = ""
use_jemalloc_dfx_intf = false use_jemalloc_dfx_intf = false
use_jemalloc_recycle_func = false use_jemalloc_recycle_func = false
use_pthread_cancel = false use_pthread_cancel = false
......
...@@ -288,9 +288,9 @@ template("musl_libs") { ...@@ -288,9 +288,9 @@ template("musl_libs") {
include_dirs += [ include_dirs += [
"//third_party", "//third_party",
"//third_party/musl/src/include/", "//third_party/musl/src/include/",
"//third_party/jemalloc/include/", "${musl_malloc_plugin}/include/",
"//third_party/jemalloc/include/jemalloc/internal", "${musl_malloc_plugin}/include/jemalloc/internal",
"//third_party/jemalloc/include/jemalloc", "${musl_malloc_plugin}/include/jemalloc",
] ]
} }
...@@ -586,7 +586,7 @@ template("musl_libs") { ...@@ -586,7 +586,7 @@ template("musl_libs") {
if (use_jemalloc_recycle_func) { if (use_jemalloc_recycle_func) {
defines += [ "USE_JEMALLOC_RECYCLE_FUNC" ] defines += [ "USE_JEMALLOC_RECYCLE_FUNC" ]
} }
include_dirs = [ "//third_party/jemalloc/include/jemalloc" ] include_dirs = [ "${musl_malloc_plugin}/include/jemalloc" ]
} }
if (!defined(include_dirs)) { if (!defined(include_dirs)) {
...@@ -802,7 +802,7 @@ template("musl_libs") { ...@@ -802,7 +802,7 @@ template("musl_libs") {
if (use_jemalloc_recycle_func) { if (use_jemalloc_recycle_func) {
defines += [ "USE_JEMALLOC_RECYCLE_FUNC" ] defines += [ "USE_JEMALLOC_RECYCLE_FUNC" ]
} }
include_dirs = [ "//third_party/jemalloc/include/jemalloc" ] include_dirs = [ "${musl_malloc_plugin}/include/jemalloc" ]
} }
configs -= musl_inherited_configs configs -= musl_inherited_configs
...@@ -822,7 +822,7 @@ template("musl_libs") { ...@@ -822,7 +822,7 @@ template("musl_libs") {
} }
source_set("soft_musl_jemalloc") { source_set("soft_musl_jemalloc") {
sources = [ "./porting/linux/user/src/malloc/jemalloc/jemalloc.c" ] sources = [ "${musl_malloc_plugin}/src/static.c" ]
deps = [ deps = [
"//third_party/musl:create_alltypes_h", "//third_party/musl:create_alltypes_h",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册