From af5f6a53a9e02cf0258dd46838bb990d30310cd6 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 12 Oct 2018 16:25:29 -0700 Subject: [PATCH] -DSYSTEM_CLANG=off: 6.0.1 -> 7.0.0 --- clang_archive_hashes/LLVM-6.0.1-win64.exe.SHA256 | 1 - clang_archive_hashes/LLVM-7.0.0-win64.exe.SHA256 | 1 + .../clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz.SHA256 | 1 - ...clang+llvm-6.0.1-amd64-unknown-freebsd10.tar.xz.SHA256 | 1 - ...llvm-6.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 | 1 - ...clang+llvm-7.0.0-amd64-unknown-freebsd11.tar.xz.SHA256 | 1 + .../clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz.SHA256 | 1 + ...llvm-7.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz.SHA256 | 1 + ...llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 | 1 + cmake/DownloadAndExtractClang.cmake | 8 +++----- 10 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 clang_archive_hashes/LLVM-6.0.1-win64.exe.SHA256 create mode 100644 clang_archive_hashes/LLVM-7.0.0-win64.exe.SHA256 delete mode 100644 clang_archive_hashes/clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz.SHA256 delete mode 100644 clang_archive_hashes/clang+llvm-6.0.1-amd64-unknown-freebsd10.tar.xz.SHA256 delete mode 100644 clang_archive_hashes/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 create mode 100644 clang_archive_hashes/clang+llvm-7.0.0-amd64-unknown-freebsd11.tar.xz.SHA256 create mode 100644 clang_archive_hashes/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz.SHA256 create mode 100644 clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz.SHA256 create mode 100644 clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 diff --git a/clang_archive_hashes/LLVM-6.0.1-win64.exe.SHA256 b/clang_archive_hashes/LLVM-6.0.1-win64.exe.SHA256 deleted file mode 100644 index 5d218384..00000000 --- a/clang_archive_hashes/LLVM-6.0.1-win64.exe.SHA256 +++ /dev/null @@ -1 +0,0 @@ -780276221635aa08120187ffc2c72ff7873dee37f5609455ee7bba6fcdd91d79 \ No newline at end of file diff --git a/clang_archive_hashes/LLVM-7.0.0-win64.exe.SHA256 b/clang_archive_hashes/LLVM-7.0.0-win64.exe.SHA256 new file mode 100644 index 00000000..54bea9e6 --- /dev/null +++ b/clang_archive_hashes/LLVM-7.0.0-win64.exe.SHA256 @@ -0,0 +1 @@ +74b197a3959b0408adf0824be01db8dddfa2f9a967f4085af3fad900ed5fdbf6 \ No newline at end of file diff --git a/clang_archive_hashes/clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz.SHA256 deleted file mode 100644 index 1d30f273..00000000 --- a/clang_archive_hashes/clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz.SHA256 +++ /dev/null @@ -1 +0,0 @@ -0ef8e99e9c9b262a53ab8f2821e2391d041615dd3f3ff36fdf5370916b0f4268 diff --git a/clang_archive_hashes/clang+llvm-6.0.1-amd64-unknown-freebsd10.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-6.0.1-amd64-unknown-freebsd10.tar.xz.SHA256 deleted file mode 100644 index 9a7df324..00000000 --- a/clang_archive_hashes/clang+llvm-6.0.1-amd64-unknown-freebsd10.tar.xz.SHA256 +++ /dev/null @@ -1 +0,0 @@ -6d1f67c9e7c3481106d5c9bfcb8a75e3876eb17a446a14c59c13cafd000c21d2 \ No newline at end of file diff --git a/clang_archive_hashes/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 deleted file mode 100644 index 671a75e2..00000000 --- a/clang_archive_hashes/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 +++ /dev/null @@ -1 +0,0 @@ -7ea204ecd78c39154d72dfc0d4a79f7cce1b2264da2551bb2eef10e266d54d91 \ No newline at end of file diff --git a/clang_archive_hashes/clang+llvm-7.0.0-amd64-unknown-freebsd11.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-7.0.0-amd64-unknown-freebsd11.tar.xz.SHA256 new file mode 100644 index 00000000..b8a56bfa --- /dev/null +++ b/clang_archive_hashes/clang+llvm-7.0.0-amd64-unknown-freebsd11.tar.xz.SHA256 @@ -0,0 +1 @@ +95ceb933ccf76e3ddaa536f41ab82c442bbac07cdea6f9fbf6e3b13cc1711255 \ No newline at end of file diff --git a/clang_archive_hashes/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz.SHA256 new file mode 100644 index 00000000..86f733c9 --- /dev/null +++ b/clang_archive_hashes/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz.SHA256 @@ -0,0 +1 @@ +b3ad93c3d69dfd528df9c5bb1a434367babb8f3baea47fbb99bf49f1b03c94ca \ No newline at end of file diff --git a/clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz.SHA256 new file mode 100644 index 00000000..bc830691 --- /dev/null +++ b/clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz.SHA256 @@ -0,0 +1 @@ +5c90e61b06d37270bc26edb305d7e498e2c7be22d99e0afd9f2274ef5458575a \ No newline at end of file diff --git a/clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 b/clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 new file mode 100644 index 00000000..1475a0a8 --- /dev/null +++ b/clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256 @@ -0,0 +1 @@ +69b85c833cd28ea04ce34002464f10a6ad9656dd2bba0f7133536a9927c660d2 \ No newline at end of file diff --git a/cmake/DownloadAndExtractClang.cmake b/cmake/DownloadAndExtractClang.cmake index d7c11755..9365b188 100644 --- a/cmake/DownloadAndExtractClang.cmake +++ b/cmake/DownloadAndExtractClang.cmake @@ -6,7 +6,7 @@ # Downloads 7-Zip to extract Clang if it isn't available in the PATH function(download_and_extract_clang CLANG_DOWNLOAD_LOCATION) -set(CLANG_VERSION 6.0.1) +set(CLANG_VERSION 7.0.0) set(CLANG_ARCHIVE_EXT .tar.xz) if(${CMAKE_SYSTEM_NAME} STREQUAL Linux) @@ -17,8 +17,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Linux) elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin) - # No Darwin binaries were released for LLVM 6.0.1 - set(CLANG_VERSION 6.0.0) set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-x86_64-apple-darwin) elseif(${CMAKE_SYSTEM_NAME} STREQUAL Windows) @@ -28,7 +26,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL Windows) elseif(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) - set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-amd64-unknown-freebsd10) + set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-amd64-unknown-freebsd11) endif() @@ -93,7 +91,7 @@ if(${CLANG_ARCHIVE_EXT} STREQUAL .exe) include(DownloadAndExtract7zip) download_and_extract_7zip(${CLANG_DOWNLOAD_LOCATION}) find_program(7ZIP_EXECUTABLE - NAMES 7z + NAMES 7z NO_DEFAULT_PATH PATHS ${DOWNLOADED_7ZIP_DIR} )