Skip to content

Commit 3c3cb5c

Browse files
committed
Update to clang 15; drop freebsd support for now
1 parent 5f1e712 commit 3c3cb5c

File tree

2 files changed

+38
-34
lines changed

2 files changed

+38
-34
lines changed

build.py

Lines changed: 16 additions & 14 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 = '14.0.0'
110+
CLANGD_VERSION = '15.0.0'
111111
CLANGD_BINARIES_ERROR_MESSAGE = (
112112
'No prebuilt Clang {version} binaries for {platform}. '
113113
'You\'ll have to compile Clangd {version} from source '
@@ -1128,36 +1128,38 @@ def GetClangdTarget():
11281128
if OnWindows():
11291129
return [
11301130
( 'clangd-{version}-win64',
1131-
'529c5b782d926536aedcb2d7a3c8a813fa05ada9193ec4119b28deb3f83634b2' ),
1131+
'6dc5d885857904f661540864a92e044a9ead8efc104adf02698a441fe54fda82' ),
11321132
( 'clangd-{version}-win32',
1133-
'6c7f0985370ebede0f61ff66a1b4886079f199bc346c2baa941de9ad76e907a7' ) ]
1133+
'7ed56b64b06336aab00785fbcb0e4c00693b52dcc76cf300616634d3fd554ab2' ) ]
11341134
if OnMac():
11351135
if OnArm():
11361136
return [
11371137
( 'clangd-{version}-arm64-apple-darwin',
1138-
'6b4bed9378a9ac3d84720dbcf76e4c60b0afc27567d42d7837f9da8b039d13c5' ) ]
1138+
'709b5d0e3c0b267177227bb3be7931e9923c1eb618e962d709eb3a579e539d59' ) ]
11391139
return [
11401140
( 'clangd-{version}-x86_64-apple-darwin',
1141-
'867342cffc04ab3c1936121ed643e07df666119afad6518835a26306db8767ce' ) ]
1142-
if OnFreeBSD():
1143-
return [
1144-
( 'clangd-{version}-amd64-unknown-freebsd13',
1145-
'5db1f95eea87d216d7a7490c207918962cddfdee6387594f6f6043ae21dde22f' ),
1146-
( 'clangd-{version}-i386-unknown-freebsd13',
1147-
'b9f6d0be1476dfb71ee16d12639b7fe425dc90097d81fbf2bdd0cb7248338ca2' ) ]
1141+
'1286e93cfcc7201e48989c53da47d7cd49e653ee09ff94e4f82d99fa33fd4743' ) ]
1142+
# FreeBSD binaries are not yet available for clang 15
1143+
#
1144+
# if OnFreeBSD():
1145+
# return [
1146+
# ( 'clangd-{version}-amd64-unknown-freebsd13',
1147+
# '' ),
1148+
# ( 'clangd-{version}-i386-unknown-freebsd13',
1149+
# '' ) ]
11481150
if OnAArch64():
11491151
return [
11501152
( 'clangd-{version}-aarch64-linux-gnu',
1151-
'c5e2ac2f9381f6c1bf2305af0458360160a86c8dbd369c923a71c673f391142d' ) ]
1153+
'1659eef1ea33859d884f3f7d9a0ec40e3b1a032f2b0f3fb89acb36239669ea42' ) ]
11521154
if OnArm():
11531155
return [
11541156
None, # First list index is for 64bit archives. ARMv7 is 32bit only.
11551157
( 'clangd-{version}-armv7a-linux-gnueabihf',
1156-
'86b4582d551b8d5558b4bdd1060fbb3ec9ae4e0c7c6f9489db1a4088f5e71ef3' ) ]
1158+
'a31632d6d2cd28239b553a30da6b6700c7ddb7b64881e3fd9b795baf61c67fff' ) ]
11571159
if OnX86_64():
11581160
return [
11591161
( 'clangd-{version}-x86_64-unknown-linux-gnu',
1160-
'9c17b5550ba927aa3f661300b4258109d3a23aecdd97fef81185d0d0b5529d36' ) ]
1162+
'e1d23a6bfecdcc6eb3a5ded82e6939a4767621f6b7a736d5817d22c48860c563' ) ]
11611163
raise InstallationFailed(
11621164
CLANGD_BINARIES_ERROR_MESSAGE.format( version = CLANGD_VERSION,
11631165
platform = 'this system' ) )

cpp/ycm/CMakeLists.txt

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

33-
set( CLANG_VERSION 14.0.0 )
33+
set( CLANG_VERSION 15.0.0 )
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-
"04ed0ebe78f8128d41585dae96ba01f15e253483db6d98d361f3bb0fba5ee135" )
39+
"6c881db7ea70e9f91a8f2266ebc0dd56adde9979b47cbea439fcb885ff250617" )
4040
else()
4141
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-x86_64-apple-darwin" )
4242
set( LIBCLANG_SHA256
43-
"3f46d66cc2345f7bbf6394b16a9232bf291ab992bd7a5a4380800c92c1c409b3" )
43+
"ec5965a4ff4216f66810dadf1177689ac767ec5f08f198991b3d263d604d4859" )
4444
endif()
4545
elseif ( WIN32 )
4646
if( 64_BIT_PLATFORM )
4747
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win64" )
4848
set( LIBCLANG_SHA256
49-
"22b1497fb261b402761c3a0fd7cb59badda0e99156a8661d44953939e123c0c4" )
49+
"30aae21f58ff7f11f010d793cb4eb114abcb55b91940f0698b3f0c01263f2dd9" )
5050
else()
5151
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win32" )
5252
set( LIBCLANG_SHA256
53-
"74cd1a0de17877c6d291979ddfc696969a0aa1c3b47122396f61c0e9286a3a9d" )
53+
"6193530d7ac64a4db482e51ecfee729ced912d233e4c3bb9d7bbf2eab63278b1" )
5454
endif()
55-
elseif ( SYSTEM_IS_FREEBSD )
56-
if ( 64_BIT_PLATFORM )
57-
set( LIBCLANG_DIRNAME
58-
"libclang-${CLANG_VERSION}-amd64-unknown-freebsd13" )
59-
set( LIBCLANG_SHA256
60-
"6efd6cc111939766dde6873fbd371280c13ffbb3c7fae193d5f66bd988ccf440" )
61-
else()
62-
set( LIBCLANG_DIRNAME
63-
"libclang-${CLANG_VERSION}-i386-unknown-freebsd13" )
64-
set( LIBCLANG_SHA256
65-
"0d3e808e04d4ebb6023402310316799b6c9c4220763fd13d7691dc24969ce4c4" )
66-
endif()
55+
# FreeBSD binaries are not yet available for llvm 15
56+
#
57+
# elseif ( SYSTEM_IS_FREEBSD )
58+
# if ( 64_BIT_PLATFORM )
59+
# set( LIBCLANG_DIRNAME
60+
# "libclang-${CLANG_VERSION}-amd64-unknown-freebsd13" )
61+
# set( LIBCLANG_SHA256
62+
# "6efd6cc111939766dde6873fbd371280c13ffbb3c7fae193d5f66bd988ccf440" )
63+
# else()
64+
# set( LIBCLANG_DIRNAME
65+
# "libclang-${CLANG_VERSION}-i386-unknown-freebsd13" )
66+
# set( LIBCLANG_SHA256
67+
# "0d3e808e04d4ebb6023402310316799b6c9c4220763fd13d7691dc24969ce4c4" )
68+
# endif()
6769
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" )
6870
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-aarch64-linux-gnu" )
6971
set( LIBCLANG_SHA256
70-
"e11048e3fceaba016a4521c2138166a006abaa5c4eba23e4b2f2b354e81a130b" )
72+
"3f704f93d081e5419b40d22fe58ed700f826aac95d8f53c210c25eb03cab306b" )
7173
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)" )
7274
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-armv7a-linux-gnueabihf" )
7375
set( LIBCLANG_SHA256
74-
"321fd6679a5776c6f5df6169343032ac4b300aac8228e232c23067fdbcbbb7cb" )
76+
"2230ee6acb296e932824947324517c4f17d5773fd299769bcf21e0b713293c43" )
7577
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64)" )
7678
set( LIBCLANG_DIRNAME
7779
"libclang-${CLANG_VERSION}-x86_64-unknown-linux-gnu" )
7880
set( LIBCLANG_SHA256
79-
"a5b70d17102484cd4b5dbd1d63206bd0a41b130359428a0b2d7817eba768e3f4" )
81+
"9c2027cccea93988fc5b144814fe144bd7b0fb1e4f56fd153bebbc62bd9fd434" )
8082
else()
8183
message( FATAL_ERROR
8284
"No prebuilt Clang ${CLANG_VERSION} binaries for this system. "

0 commit comments

Comments
 (0)