diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/llvm | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/llvm')
| -rw-r--r-- | ports/llvm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/llvm/fix-build-error.patch | 16 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index d4e631680..1bc8335fc 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,4 +1,4 @@ Source: llvm
-Version: 7.0.0-2
+Version: 7.0.0-3
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)
diff --git a/ports/llvm/fix-build-error.patch b/ports/llvm/fix-build-error.patch new file mode 100644 index 000000000..a311fb959 --- /dev/null +++ b/ports/llvm/fix-build-error.patch @@ -0,0 +1,16 @@ +diff --git a/tools/clang/tools/libclang/CMakeLists.txt b/tools/clang/tools/libclang/CMakeLists.txt +index e539c83..09c1ea3 100644 +--- a/tools/clang/tools/libclang/CMakeLists.txt ++++ b/tools/clang/tools/libclang/CMakeLists.txt +@@ -56,10 +56,7 @@ if (TARGET clangTidyPlugin) + endif() + endif () + +-find_library(DL_LIBRARY_PATH dl) +-if (DL_LIBRARY_PATH) +- list(APPEND LIBS dl) +-endif() ++list(APPEND LIBS "${DL_LIBRARY_PATH}") + + option(LIBCLANG_BUILD_STATIC + "Build libclang as a static library (in addition to a shared one)" OFF) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index a471ec1ae..1828ea86e 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -28,7 +28,9 @@ endif() vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch
+ PATCHES
+ install-cmake-modules-to-share.patch
+ fix-build-error.patch
)
vcpkg_find_acquire_program(PYTHON3)
|