Skip to content

Commit c7608ff

Browse files
committed
Update to clang 15.0.1 to fix regressions in clangd
1 parent c593846 commit c7608ff

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

build.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def Exit( self ):
107107
'issue tracker, including the entire output of this script (with --verbose) '
108108
'and the invocation line used to run it.' )
109109

110-
CLANGD_VERSION = '15.0.0'
110+
CLANGD_VERSION = '15.0.1'
111111
CLANGD_BINARIES_ERROR_MESSAGE = (
112112
'No prebuilt Clang {version} binaries for {platform}. '
113113
'You\'ll have to compile Clangd {version} from source '
@@ -1128,18 +1128,18 @@ def GetClangdTarget():
11281128
if OnWindows():
11291129
return [
11301130
( 'clangd-{version}-win64',
1131-
'6dc5d885857904f661540864a92e044a9ead8efc104adf02698a441fe54fda82' ),
1131+
'e5da88a729d1c9d00c8a965bdbfdf081a9c7a1602d5cdf7cd75aacea72180195' ),
11321132
( 'clangd-{version}-win32',
1133-
'7ed56b64b06336aab00785fbcb0e4c00693b52dcc76cf300616634d3fd554ab2' ) ]
1133+
'e5be596af3b4ab5f648e6a3b67bb60a3e97f6567d2b3c43a38f30158792e2641' ) ]
11341134
if OnMac():
11351135
if OnArm():
11361136
return [
11371137
( 'clangd-{version}-arm64-apple-darwin',
1138-
'709b5d0e3c0b267177227bb3be7931e9923c1eb618e962d709eb3a579e539d59' ) ]
1138+
'7a606e37b03a795bf673116ef6c58cb888e7bd01199602bcae549c90927f124f' ) ]
11391139
return [
11401140
( 'clangd-{version}-x86_64-apple-darwin',
1141-
'1286e93cfcc7201e48989c53da47d7cd49e653ee09ff94e4f82d99fa33fd4743' ) ]
1142-
# FreeBSD binaries are not yet available for clang 15
1141+
'0be7dc9042584a84524f57d62bde0ef168b3e00a02205053cfe5f73a13475c97' ) ]
1142+
# FreeBSD binaries are not yet available for clang 15.0.1
11431143
#
11441144
# if OnFreeBSD():
11451145
# return [
@@ -1150,16 +1150,16 @@ def GetClangdTarget():
11501150
if OnAArch64():
11511151
return [
11521152
( 'clangd-{version}-aarch64-linux-gnu',
1153-
'1659eef1ea33859d884f3f7d9a0ec40e3b1a032f2b0f3fb89acb36239669ea42' ) ]
1153+
'2497705a703c0ed5b5ef8717e247b87d084729d6cae20176e0f4dc8e33fff24b' ) ]
11541154
if OnArm():
11551155
return [
11561156
None, # First list index is for 64bit archives. ARMv7 is 32bit only.
11571157
( 'clangd-{version}-armv7a-linux-gnueabihf',
1158-
'a31632d6d2cd28239b553a30da6b6700c7ddb7b64881e3fd9b795baf61c67fff' ) ]
1158+
'615262e7827f0ab273445390d9a0f4d841ba7fc75326483466651a846f4f5586' ) ]
11591159
if OnX86_64():
11601160
return [
11611161
( 'clangd-{version}-x86_64-unknown-linux-gnu',
1162-
'e1d23a6bfecdcc6eb3a5ded82e6939a4767621f6b7a736d5817d22c48860c563' ) ]
1162+
'8bf1177483daf10012f4e98ae4a6eec4f737bd1b6c8823b3b9b4a670479fcf58' ) ]
11631163
raise InstallationFailed(
11641164
CLANGD_BINARIES_ERROR_MESSAGE.format( version = CLANGD_VERSION,
11651165
platform = 'this system' ) )

cpp/ycm/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,55 +30,55 @@ if ( USE_CLANG_COMPLETER AND
3030
NOT PATH_TO_LLVM_ROOT AND
3131
NOT EXTERNAL_LIBCLANG_PATH )
3232

33-
set( CLANG_VERSION 15.0.0 )
33+
set( CLANG_VERSION 15.0.1 )
3434

3535
if ( APPLE )
3636
if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64" )
3737
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-arm64-apple-darwin" )
3838
set( LIBCLANG_SHA256
39-
"6c881db7ea70e9f91a8f2266ebc0dd56adde9979b47cbea439fcb885ff250617" )
39+
"91d0c94cea43abe36d1fc954f78bc44dc77773fdf4680dd0958f05a8c859fcae" )
4040
else()
4141
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-x86_64-apple-darwin" )
4242
set( LIBCLANG_SHA256
43-
"ec5965a4ff4216f66810dadf1177689ac767ec5f08f198991b3d263d604d4859" )
43+
"f004735cb8bfd56a8ea3c0ed21d1c8c02127ea23ce62eda38143270650a902fe" )
4444
endif()
4545
elseif ( WIN32 )
4646
if( 64_BIT_PLATFORM )
4747
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win64" )
4848
set( LIBCLANG_SHA256
49-
"30aae21f58ff7f11f010d793cb4eb114abcb55b91940f0698b3f0c01263f2dd9" )
49+
"6e3196a4b92b5313898e51745c51d95410efd08fb2f1fabeba7205537ef7fed8" )
5050
else()
5151
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win32" )
5252
set( LIBCLANG_SHA256
53-
"6193530d7ac64a4db482e51ecfee729ced912d233e4c3bb9d7bbf2eab63278b1" )
53+
"3e0f81aeb47ad1f748abc51a5b37cdb5086a9aaac03955c1fdd0930b41887e11" )
5454
endif()
55-
# FreeBSD binaries are not yet available for llvm 15
55+
# FreeBSD binaries are not yet available for llvm 15.0,1
5656
#
5757
# elseif ( SYSTEM_IS_FREEBSD )
5858
# if ( 64_BIT_PLATFORM )
5959
# set( LIBCLANG_DIRNAME
6060
# "libclang-${CLANG_VERSION}-amd64-unknown-freebsd13" )
6161
# set( LIBCLANG_SHA256
62-
# "6efd6cc111939766dde6873fbd371280c13ffbb3c7fae193d5f66bd988ccf440" )
62+
# "" )
6363
# else()
6464
# set( LIBCLANG_DIRNAME
6565
# "libclang-${CLANG_VERSION}-i386-unknown-freebsd13" )
6666
# set( LIBCLANG_SHA256
67-
# "0d3e808e04d4ebb6023402310316799b6c9c4220763fd13d7691dc24969ce4c4" )
67+
# "" )
6868
# endif()
6969
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" )
7070
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-aarch64-linux-gnu" )
7171
set( LIBCLANG_SHA256
72-
"3f704f93d081e5419b40d22fe58ed700f826aac95d8f53c210c25eb03cab306b" )
72+
"294ffae61aab3198dc26b8cb891475ab4c08ab4e20f826c687260730350a3eaf" )
7373
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)" )
7474
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-armv7a-linux-gnueabihf" )
7575
set( LIBCLANG_SHA256
76-
"2230ee6acb296e932824947324517c4f17d5773fd299769bcf21e0b713293c43" )
76+
"e8ebe03b6fc558699f8ce389dd3693a9ac8cf4170b436cc0123fd923eba057d6" )
7777
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64)" )
7878
set( LIBCLANG_DIRNAME
7979
"libclang-${CLANG_VERSION}-x86_64-unknown-linux-gnu" )
8080
set( LIBCLANG_SHA256
81-
"9c2027cccea93988fc5b144814fe144bd7b0fb1e4f56fd153bebbc62bd9fd434" )
81+
"89e8fdb6e7b694226405c6c2b8f5ef26f7683b4328bca7d7e611314189a75aa9" )
8282
else()
8383
message( FATAL_ERROR
8484
"No prebuilt Clang ${CLANG_VERSION} binaries for this system. "

0 commit comments

Comments
 (0)