[PATCH] D117001: [zorg] Add flang to clang-arm64-windows-msvc

[Diana Picus via Phabricator via llvm-commits]

rovka created this revision.
rovka added reviewers: gkistanova, maxim-kuvyrkov.
rovka added a project: Zorg.
Herald added a subscriber: kristof.beyls.
Herald added a reviewer: sscalpone.
rovka requested review of this revision.

This requires a small hack to add the path to clang's builtins
library to the link commands. We're putting that in an environment
variable so we can update it on the bot whenever we're updating
the clang version that we use.


Repository:
  rZORG LLVM Github Zorg

https://reviews.llvm.org/D117001

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
@@ -234,11 +234,16 @@
     'builddir': "clang-arm64-windows-msvc",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     vs="manual",
+                    checkout_flang=True,
                     test=False, # Disable testing until MCJIT failures are fixed
                     extra_cmake_args=[
                         "-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-windows-msvc",
                         "-DLLVM_HOST_TRIPLE=aarch64-windows-msvc",
                         "-DLLVM_TARGET_ARCH=AArch64",
+                        "-DCMAKE_EXE_LINKER_FLAGS=%BUILTINS%",
+                        "-DCMAKE_SHARED_LINKER_FLAGS=%BUILTINS%",
+                        "-DCMAKE_STATIC_LINKER_FLAGS=%BUILTINS%",
+                        "-DCMAKE_MODULE_LINKER_FLAGS=%BUILTINS%",
                         # 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.
                         "-DCOMPILER_RT_BUILD_SANITIZERS=OFF",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117001.398882.patch
Type: text/x-patch
Size: 1280 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220111/66d4e98b/attachment.bin>