summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Picus <diana.picus@linaro.org>2022-08-15 14:01:39 +0200
committerDiana Picus <diana.picus@linaro.org>2022-09-19 11:55:49 +0000
commitd7142defb8cf8344574ef1310d19a6b5c32651c2 (patch)
tree2bd1af96c20c5c91951ae4dfb4b298680061c03f
parentff16c792dda228b5867ef5b98f062389af0ee179 (diff)
build_llvm_package.bat: Minor fixes to WoA release
Pass LLDB_EMBED_PYTHON_HOME=OFF Use CMAKE_TRY_COMPILE_CONFIGURATION=Release (otherwise it's trying and failing to link in debug versions of DLLs) Use aarch64-pc-windows-msvc as triple instead of just aarch64-windows-msvc. Change-Id: Ibc3cb34320cf007133637b6e134582ab49625332
-rwxr-xr-xbuild_llvm_package.bat6
1 files changed, 4 insertions, 2 deletions
diff --git a/build_llvm_package.bat b/build_llvm_package.bat
index 3d1d7b70..20f70e48 100755
--- a/build_llvm_package.bat
+++ b/build_llvm_package.bat
@@ -64,14 +64,15 @@ mv llvm-project-* llvm-project || exit /b
REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
set cmake_flags=^
-DCMAKE_BUILD_TYPE=Release ^
+ -DCMAKE_TRY_COMPILE_CONFIGURATION=Release ^
-DLLVM_ENABLE_ASSERTIONS=ON ^
-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ^
-DLLVM_BUILD_LLVM_C_DYLIB=ON ^
-DCMAKE_INSTALL_UCRT_LIBRARIES=ON ^
-DPACKAGE_VERSION=%package_version% ^
-DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " ^
- -DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-windows-msvc ^
- -DLLVM_HOST_TRIPLE=aarch64-windows-msvc ^
+ -DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-pc-windows-msvc ^
+ -DLLVM_HOST_TRIPLE=aarch64-pc-windows-msvc ^
-DLLVM_TARGET_ARCH=AArch64 ^
-DCLANG_DEFAULT_LINKER=lld
@@ -124,6 +125,7 @@ cmake -GNinja %cmake_flags% ^
-DCOMPILER_RT_BUILD_XRAY=OFF ^
-DLLDB_ENABLE_PYTHON=ON ^
-DLLDB_RELOCATABLE_PYTHON=ON ^
+ -DLLDB_EMBED_PYTHON_HOME=OFF ^
-DCMAKE_EXE_LINKER_FLAGS=%builtins% ^
-DCMAKE_SHARED_LINKER_FLAGS=%builtins% ^
-DCMAKE_STATIC_LINKER_FLAGS=%builtins% ^