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

!992 修改jemalloc的路径

Merge pull request !992 from littlebee/src/0720
......@@ -35,6 +35,7 @@ declare_args() {
"//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/12.0.1/lib"
user_custom_libc = true
use_jemalloc = false
musl_malloc_plugin = ""
use_jemalloc_dfx_intf = false
use_jemalloc_recycle_func = false
use_pthread_cancel = false
......
......@@ -288,9 +288,9 @@ template("musl_libs") {
include_dirs += [
"//third_party",
"//third_party/musl/src/include/",
"//third_party/jemalloc/include/",
"//third_party/jemalloc/include/jemalloc/internal",
"//third_party/jemalloc/include/jemalloc",
"${musl_malloc_plugin}/include/",
"${musl_malloc_plugin}/include/jemalloc/internal",
"${musl_malloc_plugin}/include/jemalloc",
]
}
......@@ -586,7 +586,7 @@ template("musl_libs") {
if (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)) {
......@@ -802,7 +802,7 @@ template("musl_libs") {
if (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
......@@ -822,7 +822,7 @@ template("musl_libs") {
}
source_set("soft_musl_jemalloc") {
sources = [ "./porting/linux/user/src/malloc/jemalloc/jemalloc.c" ]
sources = [ "${musl_malloc_plugin}/src/static.c" ]
deps = [
"//third_party/musl:create_alltypes_h",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册