[PATCH] D152608: GetClangResourceDir: Fix downstream projects that bundle llvm source

[Tom Stellard via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGc951960e6596: GetClangResourceDir: Fix downstream projects that bundle llvm source (authored by tstellar).
Herald added a project: LLVM.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D152608/new/

https://reviews.llvm.org/D152608

Files:
  cmake/Modules/GetClangResourceDir.cmake


Index: cmake/Modules/GetClangResourceDir.cmake
===================================================================
--- cmake/Modules/GetClangResourceDir.cmake
+++ cmake/Modules/GetClangResourceDir.cmake
@@ -12,7 +12,9 @@
   if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "")
     set(ret_dir bin/${CLANG_RESOURCE_DIR})
   else()
-    string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
+    if (NOT CLANG_VERSION_MAJOR)
+      string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
+    endif()
     set(ret_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR})
   endif()
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D152608.537573.patch
Type: text/x-patch
Size: 630 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230706/ba5f7966/attachment.bin>