From 28aceef6175a8e073ac013b3259b1f004b54a856 Mon Sep 17 00:00:00 2001 From: ydx <14173360+yyyyydx@user.noreply.gitee.com> Date: Thu, 18 Apr 2024 21:44:22 +0800 Subject: [PATCH 1/2] [Build] windows debug build modify the build.py Issue: https://gitee.com/openharmony/third_party_llvm-project/issues/I9HWJI?from=project-issue Test:run th build.py Signed-off-by: ydx --- llvm-build/build.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/llvm-build/build.py b/llvm-build/build.py index 92b11a801b6b..2ded1fc75cfd 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -881,6 +881,8 @@ class LlvmCore(BuildUtils): windows_defines['CMAKE_CXX_COMPILER'] = cxx windows_defines['CMAKE_SYSTEM_NAME'] = 'Windows' windows_defines['CMAKE_BUILD_TYPE'] = 'Release' + if self.build_config.debug: + windows_defines['CMAKE_BUILD_TYPE'] = 'Debug' windows_defines['LLVM_BUILD_RUNTIME'] = 'OFF' windows_defines['LLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD'] = 'ON' windows_defines['LLVM_TOOL_OPENMP_BUILD'] = 'OFF' @@ -927,9 +929,11 @@ class LlvmCore(BuildUtils): ) ldflag = ['-fuse-ld=lld', + '-Wl,--gc-sections', '-stdlib=libc++', '--rtlib=compiler-rt', - '-lunwind', '-Wl,--dynamicbase', + '-lunwind', + '-Wl,--dynamicbase', '-Wl,--nxcompat', '-lucrt', '-lucrtbase', @@ -940,6 +944,7 @@ class LlvmCore(BuildUtils): cflag = ['-stdlib=libc++', '--target=x86_64-pc-windows-gnu', + '-fdata-sections', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_WIN32_WINNT=0x0600', @@ -1718,6 +1723,9 @@ class LlvmLibs(BuildUtils): cmake_defines['CMAKE_C_FLAGS'] = ' '.join(cflags) cmake_defines['CMAKE_CXX_FLAGS'] = ' '.join(cflags) cmake_defines['CMAKE_BUILD_TYPE'] = 'Release' + if self.build_config.target_debug: + cmake_defines['CMAKE_BUILD_TYPE'] = 'Debug' + cmake_defines['CMAKE_TRY_COMPILE_TARGET_TYPE'] = 'STATIC_LIBRARY' cmake_defines['CMAKE_INSTALL_PREFIX'] = install_dir cmake_defines['LLVM_CONFIG_PATH'] = os.path.join(toolchain_dir, 'bin', 'llvm-config') -- Gitee From b99ef2cc515631f3a198cfbbde07a0a6b7082428 Mon Sep 17 00:00:00 2001 From: ydx Date: Fri, 19 Apr 2024 02:12:39 +0000 Subject: [PATCH 2/2] update llvm-build/build.py. Signed-off-by: ydx --- llvm-build/build.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/llvm-build/build.py b/llvm-build/build.py index 2ded1fc75cfd..1ae5634c761c 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -880,9 +880,7 @@ class LlvmCore(BuildUtils): windows_defines['CMAKE_C_COMPILER'] = cc windows_defines['CMAKE_CXX_COMPILER'] = cxx windows_defines['CMAKE_SYSTEM_NAME'] = 'Windows' - windows_defines['CMAKE_BUILD_TYPE'] = 'Release' - if self.build_config.debug: - windows_defines['CMAKE_BUILD_TYPE'] = 'Debug' + windows_defines['CMAKE_BUILD_TYPE'] = 'Debug' if self.build_config.debug else 'Release' windows_defines['LLVM_BUILD_RUNTIME'] = 'OFF' windows_defines['LLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD'] = 'ON' windows_defines['LLVM_TOOL_OPENMP_BUILD'] = 'OFF' @@ -1722,10 +1720,7 @@ class LlvmLibs(BuildUtils): cmake_defines['CMAKE_ASM_FLAGS'] = ' '.join(cflags) cmake_defines['CMAKE_C_FLAGS'] = ' '.join(cflags) cmake_defines['CMAKE_CXX_FLAGS'] = ' '.join(cflags) - cmake_defines['CMAKE_BUILD_TYPE'] = 'Release' - if self.build_config.target_debug: - cmake_defines['CMAKE_BUILD_TYPE'] = 'Debug' - + cmake_defines['CMAKE_BUILD_TYPE'] = 'Debug' if self.build_config.target_debug else 'Release' cmake_defines['CMAKE_TRY_COMPILE_TARGET_TYPE'] = 'STATIC_LIBRARY' cmake_defines['CMAKE_INSTALL_PREFIX'] = install_dir cmake_defines['LLVM_CONFIG_PATH'] = os.path.join(toolchain_dir, 'bin', 'llvm-config') -- Gitee