[PATCH] D132314: [Polly] Don't use `llvm-config` anymore (in CMake sad path)

[John Ericson via Phabricator via llvm-commits]

Ericson2314 created this revision.
Ericson2314 added reviewers: phosek, mgorny, tstellar.
Herald added a reviewer: bollu.
Herald added a project: All.
Ericson2314 requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

If `LLVM_BUILD_MAIN_SRC_DIR` is not defined, just assume we are in
regular monorepo layout. Non-standard (and not really supported) layouts
can still be configured manually.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D132314

Files:
  polly/CMakeLists.txt


Index: polly/CMakeLists.txt
===================================================================
--- polly/CMakeLists.txt
+++ polly/CMakeLists.txt
@@ -20,14 +20,11 @@
 
   # Sources available, too?
   if (LLVM_BUILD_MAIN_SRC_DIR)
-    set(LLVM_SOURCE_ROOT ${LLVM_BUILD_MAIN_SRC_DIR} CACHE PATH
-      "Path to LLVM source tree")
+    set(default_llvm_src "${LLVM_BUILD_MAIN_SRC_DIR}")
   else()
-    execute_process(COMMAND "${LLVM_TOOLS_BINARY_DIR}/llvm-config" --src-root
-      OUTPUT_VARIABLE MAIN_SRC_DIR
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set(LLVM_SOURCE_ROOT ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
+    set(default_llvm_src "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
   endif()
+  set(LLVM_SOURCE_ROOT ${default_llvm_src} CACHE PATH "Path to LLVM source tree")
 
   # Enable unit tests if available.
   set(POLLY_GTEST_AVAIL 0)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132314.454254.patch
Type: text/x-patch
Size: 857 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220820/850a22bf/attachment.bin>