[CI] Upgrade clang to 17.0.x

glandium · Oct 10, 2023 · 26249b5 · 26249b5
1 parent df5ca9c
commit 26249b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CI/docker.py b/CI/docker.py
@@ -64,7 +64,7 @@ def sources_list(snapshot, sections):
             'rm llvm-snapshot.gpg.key',
             'echo'
             ' deb [signed-by=/usr/share/keyrings/llvm.gpg]'
-            ' https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-16 main'
+            ' https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-17 main'
             ' > /etc/apt/sources.list.d/llvm.list',
             'apt-get update -o Acquire::Check-Valid-Until=false',
             'curl -sO http://snapshot.debian.org/archive/debian'
@@ -83,8 +83,8 @@ def sources_list(snapshot, sections):
         'commands': [
             'apt-get update -o Acquire::Check-Valid-Until=false',
             'apt-get install -y --no-install-recommends {}'.format(' '.join([
-                'clang-16',
-                'lld-16',
+                'clang-17',
+                'lld-17',
                 'git',
                 'make',
                 'patch',
@@ -154,12 +154,12 @@ def sources_list(snapshot, sections):
         'from': 'base',
         'commands': [
             'apt-get install -y --no-install-recommends {}'.format(' '.join([
-                'llvm-16',
+                'llvm-17',
                 'make',
             ])),
             'apt-get clean',
             'pip3 install cram==0.7',
-            'ln -s llvm-symbolizer-16 /usr/bin/llvm-symbolizer'
+            'ln -s llvm-symbolizer-17 /usr/bin/llvm-symbolizer'
         ],
     },
 }

diff --git a/CI/tools.py b/CI/tools.py
@@ -378,7 +378,7 @@ def prefix(p, s):
             raise Exception('Unknown variant: {}'.format(variant))
 
         if 'osx' not in os:
-            environ['CC'] = 'clang-16'
+            environ['CC'] = 'clang-17'
         if os in ('linux', 'arm64-linux'):
             cargo_features.append('curl-compat')
 
@@ -411,7 +411,7 @@ def prefix(p, s):
                 environ[f'CARGO_TARGET_{TARGET}_RUSTFLAGS'] = \
                     f'-C link-arg=--target={target} ' + \
                     f'-C link-arg={extra_link_arg} ' + \
-                    '-C link-arg=-fuse-ld=lld-16'
+                    '-C link-arg=-fuse-ld=lld-17'
                 rustflags = environ.pop('RUSTFLAGS', None)
                 if rustflags:
                     environ[f'CARGO_TARGET_{TARGET}_RUSTFLAGS'] += \