[PATCH] D99088: [flang][cmake] Make sure that CLANG_DIR is an absolute path

[Andrzej Warzynski via Phabricator via llvm-commits]

awarzynski created this revision.
Herald added a subscriber: mgorny.
awarzynski requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D99088

Files:
  flang/CMakeLists.txt


Index: flang/CMakeLists.txt
===================================================================
--- flang/CMakeLists.txt
+++ flang/CMakeLists.txt
@@ -48,9 +48,13 @@
   list(APPEND CMAKE_MODULE_PATH ${LLVM_DIR_ABSOLUTE})
 
   if(FLANG_BUILD_NEW_DRIVER)
+    # If the user specifies a relative path to CLANG_DIR, the calls to include
+    # Clang modules fail. Append the absolute path to CLANG_DIR instead.
+    get_filename_component(CLANG_DIR_ABSOLUTE ${CLANG_DIR} REALPATH)
+    list(APPEND CMAKE_MODULE_PATH ${CLANG_DIR_ABSOLUTEDIR})
+
     # TODO: Remove when libclangDriver is lifted out of Clang
-    list(APPEND CMAKE_MODULE_PATH ${CLANG_DIR})
-    find_package(Clang REQUIRED HINTS "${CLANG_DIR}")
+    find_package(Clang REQUIRED HINTS "${CLANG_DIR_ABSOLUTE}")
   endif()
 
   # If LLVM links to zlib we need the imported targets so we can too.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D99088.332344.patch
Type: text/x-patch
Size: 854 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210322/76dc3328/attachment.bin>