修改clang编译工具链的路径

This commit is contained in:
heppen 2023-08-04 11:50:50 +08:00
parent af0791407b
commit de7566691d
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From efc0ea7fc6de6853c2bc6157f1f8a66c671531e4 Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Fri, 4 Aug 2023 11:45:16 +0800
Subject: [PATCH] change clang compiler path
---
config/clang/clang.gni | 4 ++--
toolchain/gcc_toolchain.gni | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/clang/clang.gni b/config/clang/clang.gni
index 9728e12..f00283c 100755
--- a/config/clang/clang.gni
+++ b/config/clang/clang.gni
@@ -4,9 +4,9 @@
import("//build/toolchain/toolchain.gni")
-default_clang_base_path = "/usr/lib64/llvm15/"
+default_clang_base_path = "/usr/"
clang_lib_path =
- "${default_clang_base_path}/lib/clang/15.0.7/lib"
+ "/usr/lib64"
declare_args() {
# Indicates if the build should use the Chrome-specific plugins for enforcing
diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni
index 6a68e42..0c91ccf 100755
--- a/toolchain/gcc_toolchain.gni
+++ b/toolchain/gcc_toolchain.gni
@@ -585,7 +585,7 @@ template("clang_toolchain") {
gcc_toolchain(target_name) {
# prefix = rebase_path("$clang_base_path/bin", root_build_dir)
- prefix = "/usr/lib64/llvm15/bin"
+ prefix = "/usr/bin"
cc = "$prefix/clang"
cxx = "$prefix/clang++"
ld = cxx
--
2.33.0

View File

@ -2,7 +2,7 @@
%global openHarmony_source_release OpenHarmony-v3.2-Release
Name: distributed-build
Version: 1.0.0
Release: 6
Release: 7
Summary: openEuler embedded softbus build tools
License: Apache-2.0
URL: https://gitee.com/openharmony/build
@ -28,6 +28,7 @@ Patch0017: 0017-feat-add-script-to-create-soft-link.patch
Patch0018: 0018-feat-add-safwk-compile-gn-target.patch
Patch0019: 0019-feat-add-devicemanager-gn-files.patch
Patch0020: 0020-add-some-components-to-build.patch
Patch0021: 0021-change-clang-compiler-path.patch
BuildArch: noarch
@ -48,6 +49,9 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist
/opt/distributed-middleware-build
%changelog
* Thu Aug 03 2023 Peng He <hepeng68@huawei.com> - 1.0.0-7
- change clang compiler path.
* Thu Aug 03 2023 Peng He <hepeng68@huawei.com> - 1.0.0-6
- change clang15/llvm15/lld15 to clang/llvm/lld.