aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-01-05 15:37:14 -0800
committerGitHub <noreply@github.com>2018-01-05 15:37:14 -0800
commitcf802347a47279e43bb37592437f3632bcdc5374 (patch)
treec9293fa7e012a14129bf31985c68451dff760f53 /ports
parent2ce964f191d7cd192b1188431ef6824b7188e9f6 (diff)
parentde98ec658f552c2f98f45683ad2d157015165c4f (diff)
downloadvcpkg-cf802347a47279e43bb37592437f3632bcdc5374.tar.gz
vcpkg-cf802347a47279e43bb37592437f3632bcdc5374.zip
Merge pull request #2218 from jasjuang/llvm
[llvm] add in clang and enable tools
Diffstat (limited to 'ports')
-rw-r--r--ports/llvm/CONTROL2
-rw-r--r--ports/llvm/portfile.cmake26
2 files changed, 26 insertions, 2 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL
index c50dc8cb8..7df5565c2 100644
--- a/ports/llvm/CONTROL
+++ b/ports/llvm/CONTROL
@@ -1,4 +1,4 @@
Source: llvm
-Version: 5.0.0-2
+Version: 5.0.0-4
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index d2a82cf0b..55490a1b1 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -15,6 +15,17 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_download_distfile(CLANG_ARCHIVE
+ URLS "http://releases.llvm.org/5.0.0/cfe-5.0.0.src.tar.xz"
+ FILENAME "cfe-5.0.0.src.tar.xz"
+ SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8
+)
+vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools)
+
+if(NOT EXISTS ${SOURCE_PATH}/tools/clang)
+ file(RENAME ${SOURCE_PATH}/tools/cfe-5.0.0.src ${SOURCE_PATH}/tools/clang)
+endif()
+
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch
@@ -29,7 +40,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DLLVM_TARGETS_TO_BUILD=X86
- -DLLVM_INCLUDE_TOOLS=OFF
+ -DLLVM_INCLUDE_TOOLS=ON
-DLLVM_INCLUDE_UTILS=OFF
-DLLVM_INCLUDE_EXAMPLES=OFF
-DLLVM_INCLUDE_TESTS=OFF
@@ -39,6 +50,14 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
+file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*)
+file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*)
+file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm)
+file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm)
+file(REMOVE ${EXE})
+file(REMOVE ${DEBUG_EXE})
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clang TARGET_PATH share/clang)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)
@@ -46,6 +65,11 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/tools
${CURRENT_PACKAGES_DIR}/debug/share
+ ${CURRENT_PACKAGES_DIR}/debug/bin
+ ${CURRENT_PACKAGES_DIR}/debug/msbuild-bin
+ ${CURRENT_PACKAGES_DIR}/bin
+ ${CURRENT_PACKAGES_DIR}/msbuild-bin
+ ${CURRENT_PACKAGES_DIR}/tools/msbuild-bin
)
# Remove one empty include subdirectory if it is indeed empty