From a5319cfe116b6d5224262282fcd81701f54f640f Mon Sep 17 00:00:00 2001 From: Sukhikh Alexander Date: Thu, 5 Sep 2024 11:25:48 +0300 Subject: [PATCH] [build] Remove circular dependency in imports Issue: https://gitee.com/openharmony/third_party_llvm-project/issues/IAP4J8 Signed-off-by: Sukhikh Alexander --- llvm-build/mingw.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/llvm-build/mingw.py b/llvm-build/mingw.py index 969a9e8e7b3f..8597491acd47 100755 --- a/llvm-build/mingw.py +++ b/llvm-build/mingw.py @@ -20,7 +20,11 @@ import os import shutil import subprocess import sys -from build import BuildUtils + +def force_symlink(src, dst): + if os.path.exists(dst): + os.remove(dst) + os.symlink(src, dst) class BuildConfig(): @@ -225,8 +229,8 @@ class LlvmMingw(): # https://sourceforge.net/p/mingw-w64/mingw-w64/ci/10394c9a966f8e93e9e2f09677dab273a0f6c00c/ mingw_lib_dir = os.path.join(self.prefix, 'lib') libmingwex = os.path.join(mingw_lib_dir, 'libmingwex.a') - BuildUtils.force_symlink(libmingwex, os.path.join(mingw_lib_dir, 'libssp.a')) - BuildUtils.force_symlink(libmingwex, os.path.join(mingw_lib_dir, 'libssp_nonshared.a')) + force_symlink(libmingwex, os.path.join(mingw_lib_dir, 'libssp.a')) + force_symlink(libmingwex, os.path.join(mingw_lib_dir, 'libssp_nonshared.a')) def main(clang_version, buildtools_path): -- Gitee