[PATCH] D120654: WoA: Change target triple & try_compile config

[Diana Picus via Phabricator via llvm-commits]

rovka created this revision.
rovka added reviewers: gkistanova, maxim-kuvyrkov, DavidSpickett, omjavaid.
rovka added a project: Zorg.
Herald added subscribers: mstorsjo, kristof.beyls.
rovka requested review of this revision.

This affects the Windows on Arm builders:
clang-arm64-windows-msvc and clang-arm64-windows-msvc-2stage.

We make 2 changes:

- Triple: s/aarch64-windows-msvc/aarch64-unknown-windows-msvc; skipping

the vendor seems to confuse flang-new, so we plug an 'unknown' there.

- Add CMAKE_TRY_COMPILE_CONFIGURATION=Release, otherwise cmake tries to

use the debug configuration for try_compile commands, and fails to find
certain libraries, e.g. MSVCP140D.dll


Repository:
  rZORG LLVM Github Zorg

https://reviews.llvm.org/D120654

Files:
  buildbot/osuosl/master/config/builders.py


Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -238,8 +238,9 @@
                     checkout_flang=True,
                     checks=[], # Disable testing until MCJIT failures are fixed
                     extra_cmake_args=[
-                        "-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-windows-msvc",
-                        "-DLLVM_HOST_TRIPLE=aarch64-windows-msvc",
+                        "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
+                        "-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-unknown-windows-msvc",
+                        "-DLLVM_HOST_TRIPLE=aarch64-unknown-windows-msvc",
                         "-DLLVM_TARGET_ARCH=AArch64",
                         # The BUILTINS environment variable is expected to already exist
                         # on the worker when it is launched.
@@ -553,8 +554,9 @@
                     useTwoStage=True,
                     testStage1=False,
                     extra_cmake_args=[
-                        "-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-windows-msvc",
-                        "-DLLVM_HOST_TRIPLE=aarch64-windows-msvc",
+                        "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
+                        "-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-unknown-windows-msvc",
+                        "-DLLVM_HOST_TRIPLE=aarch64-unknown-windows-msvc",
                         "-DLLVM_TARGET_ARCH=AArch64",
                         # FIXME: compiler-rt\lib\sanitizer_common\sanitizer_unwind_win.cpp assumes WIN64 is x86_64,
                         #        so, before that's fixed, disable everything that triggers its build.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D120654.411773.patch
Type: text/x-patch
Size: 1768 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220228/9256f22c/attachment.bin>