Skip to content

Commit

Permalink
Merge pull request microsoft#4366 from jadedrip/llvm-7.0.0
Browse files Browse the repository at this point in the history
update llvm to 7.0.0
  • Loading branch information
alexkaratarakis authored Oct 20, 2018
2 parents 17766ec + 4518837 commit 4f583e6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ports/llvm/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: llvm
Version: 6.0.0-1
Version: 7.0.0
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)
16 changes: 8 additions & 8 deletions ports/llvm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
endif()

include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-6.0.0.src)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-7.0.0.src)
vcpkg_download_distfile(ARCHIVE
URLS "http://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz"
FILENAME "llvm-6.0.0.src.tar.xz"
SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
URLS "http://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz"
FILENAME "llvm-7.0.0.src.tar.xz"
SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
)
vcpkg_extract_source_archive(${ARCHIVE})

vcpkg_download_distfile(CLANG_ARCHIVE
URLS "http://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz"
FILENAME "cfe-6.0.0.src.tar.xz"
SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
URLS "http://releases.llvm.org/7.0.0/cfe-7.0.0.src.tar.xz"
FILENAME "cfe-7.0.0.src.tar.xz"
SHA512 17a658032a0160c57d4dc23cb45a1516a897e0e2ba4ebff29472e471feca04c5b68cff351cdf231b42aab0cff587b84fe11b921d1ca7194a90e6485913d62cb7
)
vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools)

if(NOT EXISTS ${SOURCE_PATH}/tools/clang)
file(RENAME ${SOURCE_PATH}/tools/cfe-6.0.0.src ${SOURCE_PATH}/tools/clang)
file(RENAME ${SOURCE_PATH}/tools/cfe-7.0.0.src ${SOURCE_PATH}/tools/clang)
endif()

vcpkg_apply_patches(
Expand Down

0 comments on commit 4f583e6

Please sign in to comment.