[PATCH] D117200: [zorg] Update flang out-of-tree builder

[Diana Picus via Phabricator via llvm-commits]

rovka created this revision.
rovka added reviewers: awarzynski, PeteSteinfeld, gkistanova.
rovka added projects: Zorg, Flang.
Herald added a subscriber: jdoerfert.
rovka requested review of this revision.

...to use the build directory instead of the install
directory for clang. This matches recent changes
to the documentation:
https://reviews.llvm.org/D117100


Repository:
  rZORG LLVM Github Zorg

https://reviews.llvm.org/D117200

Files:
  zorg/buildbot/builders/FlangBuilder.py


Index: zorg/buildbot/builders/FlangBuilder.py
===================================================================
--- zorg/buildbot/builders/FlangBuilder.py
+++ zorg/buildbot/builders/FlangBuilder.py
@@ -17,7 +17,6 @@
             depends_on_projects=['llvm','clang','mlir'],
             obj_dir="build_llvm",
             checks=[],
-            install_dir="install",
             clean=clean,
             extra_configure_args=llvm_extra_configure_args,
             env=env,
@@ -43,7 +42,7 @@
     # Add LLVM_DIR and MLIR_DIR to the CMake invocation.
     llvm_dir = "{}/lib/cmake/llvm".format(f.obj_dir)
     mlir_dir = "{}/lib/cmake/mlir".format(f.obj_dir)
-    clang_dir = "{}/lib/cmake/clang".format(f.install_dir)
+    clang_dir = "{}/lib/cmake/clang".format(f.obj_dir)
     CmakeCommand.applyRequiredOptions(flang_cmake_args, [
         # We actually need the paths to be relative to the source directory,
         # otherwise find_package can't locate the config files.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117200.399584.patch
Type: text/x-patch
Size: 982 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220113/bc4c39d6/attachment.bin>