75 lines
2.1 KiB
Diff
75 lines
2.1 KiB
Diff
From 8cfe4ff5d9910524223706b37dacdea1ff2e2aea Mon Sep 17 00:00:00 2001
|
|
From: peng_langyuan <peng_langyuan@hoperun.com>
|
|
Date: Thu, 18 May 2023 16:12:08 +0800
|
|
Subject: [PATCH 03/11] =?UTF-8?q?feat(Adapt=20to=20Openeuler):=E6=96=B0?=
|
|
=?UTF-8?q?=E5=A2=9E=E5=B9=B3=E5=8F=B0=E7=BC=96=E8=AF=91=E9=93=BE=20&&=20?=
|
|
=?UTF-8?q?=E7=BC=96=E8=AF=91=E5=B7=A5=E5=85=B7=E8=B7=AF=E5=BE=84?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
toolchain/gcc_toolchain.gni | 7 ++++++-
|
|
toolchain/linux/BUILD.gn | 30 ++++++++++++++++++++++++++++++
|
|
2 files changed, 36 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni
|
|
index 271d556..f521d7c 100755
|
|
--- a/toolchain/gcc_toolchain.gni
|
|
+++ b/toolchain/gcc_toolchain.gni
|
|
@@ -584,7 +584,12 @@ template("clang_toolchain") {
|
|
}
|
|
|
|
gcc_toolchain(target_name) {
|
|
- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
|
|
+ if (build_openeuler) {
|
|
+ prefix = "/usr/bin"
|
|
+ toolprefix = "/usr/bin/"
|
|
+ } else {
|
|
+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
|
|
+ }
|
|
cc = "$prefix/clang"
|
|
cxx = "$prefix/clang++"
|
|
ld = cxx
|
|
diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn
|
|
index 6b2d618..59449f6 100755
|
|
--- a/toolchain/linux/BUILD.gn
|
|
+++ b/toolchain/linux/BUILD.gn
|
|
@@ -116,3 +116,33 @@ gcc_toolchain("x64") {
|
|
is_clang = false
|
|
}
|
|
}
|
|
+
|
|
+clang_toolchain("linux_clang_x86_64") {
|
|
+ # Output linker map files for binary size analysis.
|
|
+ enable_linker_map = true
|
|
+
|
|
+ strip = "/usr/bin/llvm-strip"
|
|
+ toolchain_args = {
|
|
+ current_cpu = "x64"
|
|
+ current_os = "linux"
|
|
+ }
|
|
+ shlib_extension = ".so"
|
|
+}
|
|
+clang_toolchain("clang_x86_64") {
|
|
+ # Output linker map files for binary size analysis.
|
|
+ enable_linker_map = true
|
|
+
|
|
+ strip = "/usr/bin/llvm-strip"
|
|
+ toolchain_args = {
|
|
+ current_cpu = "x64"
|
|
+ current_os = "linux"
|
|
+ }
|
|
+ shlib_extension = ".so"
|
|
+}
|
|
+
|
|
+clang_toolchain("linux_clang_arm64") {
|
|
+ toolchain_args = {
|
|
+ current_cpu = "arm64"
|
|
+ current_os = "linux"
|
|
+ }
|
|
+}
|
|
--
|
|
2.33.0
|
|
|