diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-09-27 17:05:33 +0800 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-09-27 02:05:33 -0700 |
| commit | 77a0a4a6159bafbb0ba34a8e08f1f5bbc4904668 (patch) | |
| tree | ba75f62705a47057ed5b1182ec03c7a96ba262a2 /ports/llvm | |
| parent | 67a9305c75f89c6a7e229c94d1800b598f0666b3 (diff) | |
| download | vcpkg-77a0a4a6159bafbb0ba34a8e08f1f5bbc4904668.tar.gz vcpkg-77a0a4a6159bafbb0ba34a8e08f1f5bbc4904668.zip | |
[halide]Upgrade to release_2019_08_27. (#8102)
* [halide]Upgrade to release_2019_08_27.
* [llvm]Fix llvm tools path in cmake.
* Re-trigger CI system.
Diffstat (limited to 'ports/llvm')
| -rw-r--r-- | ports/llvm/CONTROL | 10 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index 9a49e3cc2..cdfd41eba 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,5 +1,5 @@ -Source: llvm
-Version: 8.0.0-1
-Homepage: https://llvm.org/
-Description: The LLVM Compiler Infrastructure
-Build-Depends: atlmfc (windows)
+Source: llvm +Version: 8.0.0-2 +Homepage: https://llvm.org/ +Description: The LLVM Compiler Infrastructure +Build-Depends: atlmfc (windows) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 07c9d9ad1..67985d18c 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -90,6 +90,12 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake "${DEBUG_MODULE}")
endif()
+if (EXISTS ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake)
+ file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake LLVM_TOOLS_MODULE)
+ string(REPLACE "\${LLVM_INSTALL_PREFIX}/bin" "\${LLVM_INSTALL_PREFIX}/tools/llvm" LLVM_TOOLS_MODULE "${LLVM_TOOLS_MODULE}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake "${LLVM_TOOLS_MODULE}")
+endif()
+
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/tools
|