From 98f79e7e8e4325c18c8ffdedd5df12cdd5e6c378 Mon Sep 17 00:00:00 2001 From: zhaohang Date: Thu, 23 May 2024 10:15:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=82=E9=85=8Dohos=20llvm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaohang --- third_party/musl/ndk_script/BUILD.gn | 34 ++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/third_party/musl/ndk_script/BUILD.gn b/third_party/musl/ndk_script/BUILD.gn index ad9e795af..0e0b7d611 100644 --- a/third_party/musl/ndk_script/BUILD.gn +++ b/third_party/musl/ndk_script/BUILD.gn @@ -10,7 +10,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. import("//build/config/clang/clang.gni") import("//build/ohos/ndk/ndk.gni") @@ -64,6 +64,7 @@ if (host_os == "mac") { } else { linux_x86_64_toolchains_dir = "${toolchains_dir}/linux-x86_64" windows_x86_64_toolchain_dir = "${toolchains_dir}/windows-x86_64" + ohos_arm64_toolchain_dir = "${toolchains_dir}/ohos-arm64" ohos_ndk_toolchains("linux_x86_64") { dest_dir = "$ndk_linux_toolchains_out_dir" @@ -94,6 +95,19 @@ if (host_os == "mac") { args = [ "--follow-all-symlinks" ] license_file = "${windows_x86_64_toolchain_dir}/llvm/NOTICE" } + + ohos_ndk_toolchains("ohos_arm64") { + dest_dir = "$ndk_ohos_toolchains_out_dir" + sources = [ + "${ohos_arm64_toolchain_dir}/llvm/bin", + "${ohos_arm64_toolchain_dir}/llvm/include", + "${ohos_arm64_toolchain_dir}/llvm/lib", + "${ohos_arm64_toolchain_dir}/llvm/libexec", + "${ohos_arm64_toolchain_dir}/llvm/python3", + "${ohos_arm64_toolchain_dir}/llvm/share", + ] + } + action("linux_toolchain") { outputs = [ "${ndk_linux_toolchains_out_dir}" ] script = "toolchain.sh" @@ -117,12 +131,24 @@ if (host_os == "mac") { } } +action("ohos_toolchain") { + outputs = [ "${ndk_ohos_toolchains_out_dir}" ] + script = "toolchain.sh" + args = + [ "-i" ] + [ rebase_path( + "${ohos_arm64_toolchain_dir}/libcxx-ndk_ohos_arm64-84c630-20240515") ] + args += [ "-o" ] + [ rebase_path("${ndk_ohos_toolchains_out_dir}") ] + args += [ "-l" ] + [ rebase_path("${linux_x86_64_toolchains_dir}/llvm/bin") ] + deps = [ ":ohos_arm64" ] +} + group("ndk_toolchain") { if (host_os == "mac") { deps = [ ":darwin_toolchain" ] } else { deps = [ ":linux_toolchain", + ":ohos_toolchain", ":windows_toolchain", ] } @@ -243,7 +269,7 @@ ohos_copy("musl_arm_bits_arm32") { sources_temp += musl_inc_bits_files sources_orig = get_path_info(sources_temp, "file") - # print("${sources_orig}") + # print("${sources_orig}") foreach(s, sources_orig) { sources += [ get_label_info(deps[0], "target_out_dir") + @@ -263,7 +289,7 @@ ohos_copy("musl_bits_aarch64") { sources_temp += musl_inc_bits_files sources_orig = get_path_info(sources_temp, "file") - # print("${sources_orig}") + # print("${sources_orig}") foreach(s, sources_orig) { sources += [ get_label_info(deps[0], "target_out_dir") + @@ -283,7 +309,7 @@ ohos_copy("musl_bits_x86_64") { sources_temp += musl_inc_bits_files sources_orig = get_path_info(sources_temp, "file") - # print("${sources_orig}") + # print("${sources_orig}") foreach(s, sources_orig) { sources += [ get_label_info(deps[0], "target_out_dir") + -- Gitee From b1adc1b9244c946c6aaaa0bb7b2450768d7d4a5b Mon Sep 17 00:00:00 2001 From: zhaohang Date: Thu, 23 May 2024 16:02:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9libcxx=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaohang --- third_party/musl/ndk_script/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/musl/ndk_script/BUILD.gn b/third_party/musl/ndk_script/BUILD.gn index 0e0b7d611..19ddc9427 100644 --- a/third_party/musl/ndk_script/BUILD.gn +++ b/third_party/musl/ndk_script/BUILD.gn @@ -136,7 +136,7 @@ action("ohos_toolchain") { script = "toolchain.sh" args = [ "-i" ] + [ rebase_path( - "${ohos_arm64_toolchain_dir}/libcxx-ndk_ohos_arm64-84c630-20240515") ] + "${ohos_arm64_toolchain_dir}/libcxx-ndk") ] args += [ "-o" ] + [ rebase_path("${ndk_ohos_toolchains_out_dir}") ] args += [ "-l" ] + [ rebase_path("${linux_x86_64_toolchains_dir}/llvm/bin") ] deps = [ ":ohos_arm64" ] -- Gitee From b5f90c893173cf9d18e1eada4b1df6352ce90a0a Mon Sep 17 00:00:00 2001 From: zhaohang Date: Thu, 23 May 2024 16:29:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96gn=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaohang --- third_party/musl/ndk_script/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/third_party/musl/ndk_script/BUILD.gn b/third_party/musl/ndk_script/BUILD.gn index 19ddc9427..ad7a2add8 100644 --- a/third_party/musl/ndk_script/BUILD.gn +++ b/third_party/musl/ndk_script/BUILD.gn @@ -134,9 +134,7 @@ if (host_os == "mac") { action("ohos_toolchain") { outputs = [ "${ndk_ohos_toolchains_out_dir}" ] script = "toolchain.sh" - args = - [ "-i" ] + [ rebase_path( - "${ohos_arm64_toolchain_dir}/libcxx-ndk") ] + args = [ "-i" ] + [ rebase_path("${ohos_arm64_toolchain_dir}/libcxx-ndk") ] args += [ "-o" ] + [ rebase_path("${ndk_ohos_toolchains_out_dir}") ] args += [ "-l" ] + [ rebase_path("${linux_x86_64_toolchains_dir}/llvm/bin") ] deps = [ ":ohos_arm64" ] -- Gitee