diff --git a/musl_config.gni b/musl_config.gni index 0f1bc0da680bd45a5c997d4321b253be7c2482af..ef8c9b3f84e9728e7c2b3e706dece07771fde280 100644 --- a/musl_config.gni +++ b/musl_config.gni @@ -27,9 +27,10 @@ declare_args() { } declare_args() { - runtime_lib_path = "//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/10.0.1/lib" + runtime_lib_path = + "//prebuilts/clang/ohos/linux-x86_64/llvm/lib/clang/10.0.1/lib" user_custom_libc = true - musl_ported_dir = "intermidiates/${musl_target_os}/musl_src_ported" + 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-4.19/prebuilts/usr/include" diff --git a/musl_template.gni b/musl_template.gni index 28045e78b1050b346ad532d97c0936b84b3e87b1..0b5b35970a8a0f4ab82989bc7c5f8f46a226a07a 100644 --- a/musl_template.gni +++ b/musl_template.gni @@ -89,6 +89,7 @@ template("musl_libs") { "//build/config/compiler:no_rtti", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", + "//build/config/sanitizers:default_sanitizer_flags", ] config("${abi_prefix}_musl_abi_config") { @@ -136,9 +137,9 @@ template("musl_libs") { ] if (musl_arch == "arm") { - cflags_basic += [ "-march=armv7-a", ] + cflags_basic += [ "-march=armv7-a" ] } else if (musl_arch == "aarch64") { - cflags_basic += [ "-march=armv8", ] + cflags_basic += [ "-march=armv8" ] } cflags_auto = [ @@ -399,11 +400,11 @@ template("musl_libs") { configs += [ ":${abi_prefix}_musl_config" ] deps = [ + ":${abi_prefix}_libdl", + ":${abi_prefix}_libpthread", ":${abi_prefix}_musl_ldso", ":${abi_prefix}_musl_src", ":${abi_prefix}_musl_src_nossp", - ":${abi_prefix}_libdl", - ":${abi_prefix}_libpthread", ] }