diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-02-22 10:49:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 10:49:55 -0800 |
| commit | 319b8f06ebbf8f524df78b4578fb0efeb6772c50 (patch) | |
| tree | 5860b250fdf54d34439c4808983875f1f5aec5ae | |
| parent | a037d826492039db9d58af47a1e1248037d15f40 (diff) | |
| download | vcpkg-319b8f06ebbf8f524df78b4578fb0efeb6772c50.tar.gz vcpkg-319b8f06ebbf8f524df78b4578fb0efeb6772c50.zip | |
[llvm] Fix resource path when building tools (#16294)
* [llvm] Fix resource path when building tools
* update version record
| -rw-r--r-- | ports/llvm/CONTROL | 1 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/llvm.json | 5 |
4 files changed, 11 insertions, 1 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index 933f234d6..5782832bc 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 ddb7db92c..8d7d7b9fe 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 e0a25ac7d..1a1bc787f 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 5385da85f..b149b5bee 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9a8e86d3dc793c4404435e87c04470da6d9cccce", + "version-string": "11.0.0", + "port-version": 1 + }, + { "git-tree": "0188d318ae61d867088f8717bc5ed178479f14a1", "version-string": "11.0.0", "port-version": 0 |