From 3fe638cfc005fb4898fed8c475444c8e5024bbe5 Mon Sep 17 00:00:00 2001 From: zwx1281682 Date: Wed, 11 Sep 2024 18:12:35 +0800 Subject: [PATCH] [BUILD]Modify the cmake configuration of Mac in env_prepare.sh Description:The cmake in the build repository has been modified Issue: https://gitee.com/openharmony/third_party_llvm-project/issues/IAQN2X?from=project-issue Test: LLVM toolchain compilation Signed-off-by: zwx1281682 --- llvm-build/build.py | 10 ++++++++-- llvm-build/env_prepare.sh | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/llvm-build/build.py b/llvm-build/build.py index f5d83b1b8dac..0f2231b8915c 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -453,8 +453,14 @@ class BuildUtils(object): self.build_config = build_config self.buildtools_path = os.path.join(self.build_config.REPOROOT_DIR, 'prebuilts') - self.CMAKE_BIN_DIR = os.path.abspath( - os.path.join(self.buildtools_path, 'cmake', self.platform_prefix(), 'bin')) + if self.host_is_linux(): + self.CMAKE_BIN_DIR = os.path.abspath( + os.path.join(self.buildtools_path, 'cmake', self.platform_prefix(), 'bin') + ) + elif self.host_is_darwin(): + self.CMAKE_BIN_DIR = os.path.abspath( + os.path.join(self.buildtools_path, 'cmake', 'darwin-universal', 'bin') + ) self._mingw_python_dir = None def open_ohos_triple(self, arch): diff --git a/llvm-build/env_prepare.sh b/llvm-build/env_prepare.sh index 7183bfc41290..e1393a461ba4 100755 --- a/llvm-build/env_prepare.sh +++ b/llvm-build/env_prepare.sh @@ -75,7 +75,7 @@ prebuilts/build-tools/${host_platform}-x86/bin,ninja-${linux_platform} """ copy_config_darwin_x86_64=""" -prebuilts/cmake,cmake-${darwin_platform} +prebuilts/cmake,cmake-darwin-universal prebuilts/clang/ohos/${host_platform}-${host_cpu},darwin_x86_64/clang_${darwin_platform} prebuilts/python3,python-${darwin_platform} prebuilts/build-tools/${host_platform}-x86/bin,gn-${darwin_platform} @@ -83,7 +83,7 @@ prebuilts/build-tools/${host_platform}-x86/bin,ninja-${darwin_platform} """ copy_config_darwin_arm64=""" -prebuilts/cmake,cmake-${darwin_platform} +prebuilts/cmake,cmake-darwin-universal prebuilts/clang/ohos/${host_platform}-${host_cpu},darwin_arm64/clang_darwin-arm64 prebuilts/python3,python-${host_platform}-${host_cpu} prebuilts/build-tools/${host_platform}-${host_cpu}/bin,gn-${darwin_platform} -- Gitee