From 54a545a6bebb2750d44aabccc22111c30b0bbd7c Mon Sep 17 00:00:00 2001 From: liuyaning Date: Wed, 3 Apr 2024 10:34:51 +0800 Subject: [PATCH] [Build]Fix the llvm ci modify the ninja path to fix llvm ci Issue:https://gitee.com/openharmony/third_party_llvm-project/issues/I9DTX2 Test:No Signed-off-by: liuyaning --- llvm-build/build.py | 2 +- llvm-build/mingw.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm-build/build.py b/llvm-build/build.py index d135ff4dfb65..bef40a27305b 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -408,7 +408,7 @@ class BuildUtils(object): install=True, build_threads=False): - ninja_bin_path = os.path.join(self.CMAKE_BIN_DIR, 'ninja') + ninja_bin_path = os.path.join(self.build_config.REPOROOT_DIR, 'prebuilts/build-tools', self.platform_prefix(), 'bin', 'ninja') ninja_list = ['-l{}'.format(build_threads)] if build_threads else [] diff --git a/llvm-build/mingw.py b/llvm-build/mingw.py index 9d27a5e1eb6e..4436944af064 100755 --- a/llvm-build/mingw.py +++ b/llvm-build/mingw.py @@ -57,7 +57,7 @@ class LlvmMingw(): self.build_config = build_config self.CMAKE_BIN_PATH = os.path.join(self.cmake_prebuilt_bin_dir(), 'cmake') - self.NINJA_BIN_PATH = os.path.join(self.cmake_prebuilt_bin_dir(), 'ninja') + self.NINJA_BIN_PATH = os.path.join(self.build_config.repo_root('prebuilts/build-tools', 'linux-x86', 'bin'), 'ninja') self.LLVM_ROOT = self.build_config.out_root('llvm-install') self.LLVM_CONFIG = os.path.join(self.LLVM_ROOT, 'bin', 'llvm-config') -- Gitee