diff --git a/llvm-build/build.py b/llvm-build/build.py index 0b43005266b30d50d95f77296fe84cd6f0ffe29f..f95a288491fd964a316a69d2ee1667208a302aad 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -249,8 +249,8 @@ class BuildConfig(): parser.add_argument( '--build-python', action='store_true', - default=True, - help='Build Python (not using prebuilt one, currently effective for Windows and OHOS)') + default=False, + help='Build Python (not using prebuilt one, currently effective for OHOS)') parser.add_argument( '--build-ncurses', @@ -3161,6 +3161,11 @@ def main(): mingw_python_dir = llvm_core.get_mingw_python_dir() llvm_package.copy_python_to_host(mingw_python_dir, build_utils.merge_out_path('windows-x86_64')) llvm_package.copy_python_to_host(mingw_python_dir, windows64_install) + else: + mingw_python_dir = os.path.join(build_utils.buildtools_path, 'python3/windows-x86/3.11.4') + llvm_core.set_mingw_python_dir(mingw_python_dir) + llvm_package.copy_python_to_host(mingw_python_dir, build_utils.merge_out_path('windows-x86_64')) + llvm_package.copy_python_to_host(mingw_python_dir, windows64_install) if build_config.enable_lzma_7zip: build_utils.logger().info('build windows lzma') @@ -3181,6 +3186,8 @@ def main(): if build_config.build_python and windows_python_builder: llvm_package.set_mingw_python_dir(windows_python_builder.install_dir) + else: + llvm_package.set_mingw_python_dir(llvm_core.get_mingw_python_dir()) if need_windows: llvm_package.package_operation(windows64_install, 'windows-x86_64') diff --git a/llvm-build/env_prepare.sh b/llvm-build/env_prepare.sh index e1393a461ba4c06b242090b984bf691944c550c3..7945ab3d533ee16475644ce45e1b7b5a2b68fcda 100755 --- a/llvm-build/env_prepare.sh +++ b/llvm-build/env_prepare.sh @@ -70,6 +70,7 @@ prebuilts/cmake,cmake-${linux_platform} prebuilts/clang/ohos/${host_platform}-${host_cpu},linux/clang_${linux_platform} prebuilts/python3,python-${linux_platform} prebuilts/python3,python-linux-arm64 +prebuilts/python3,python-mingw-x86 prebuilts/build-tools/${host_platform}-x86/bin,gn-${linux_platform} prebuilts/build-tools/${host_platform}-x86/bin,ninja-${linux_platform} """