From 319b8f06ebbf8f524df78b4578fb0efeb6772c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Mon, 22 Feb 2021 10:49:55 -0800
Subject: [PATCH] [llvm] Fix resource path when building tools (#16294)

* [llvm] Fix resource path when building tools

* update version record
---
 ports/llvm/CONTROL        | 1 +
 ports/llvm/portfile.cmake | 4 ++++
 versions/baseline.json    | 2 +-
 versions/l-/llvm.json     | 5 +++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL
index 933f234d60..5782832bc8 100644
--- a/ports/llvm/CONTROL
+++ b/ports/llvm/CONTROL
@@ -1,5 +1,6 @@
 Source: llvm
 Version: 11.0.0
+Port-Version: 1
 Homepage: https://llvm.org/
 Description: The LLVM Compiler Infrastructure
 Supports: !uwp
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index ddb7db92c8..8d7d7b9fea 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -119,6 +119,10 @@ if("polly" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "polly")
 endif()
 
+if("tools" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=../../lib/clang/11.0.0)
+endif()
+
 set(known_llvm_targets
     AArch64
     AMDGPU
diff --git a/versions/baseline.json b/versions/baseline.json
index e0a25ac7df..1a1bc787f9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3598,7 +3598,7 @@
     },
     "llvm": {
       "baseline": "11.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "lmdb": {
       "baseline": "0.9.24",
diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json
index 5385da85f4..b149b5beef 100644
--- a/versions/l-/llvm.json
+++ b/versions/l-/llvm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9a8e86d3dc793c4404435e87c04470da6d9cccce",
+      "version-string": "11.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "0188d318ae61d867088f8717bc5ed178479f14a1",
       "version-string": "11.0.0",