Skip to content

Commit e0bd647

Browse files
authored
github: Update to clang-16 for CI builds (#9093)
Also update documentation on official recommendation of clang version.
1 parent d2b9eb5 commit e0bd647

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

BUILDING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
To build Filament, you must first install the following tools:
66

7-
- CMake 3.19 (or more recent)
8-
- clang 14.0 (or more recent)
7+
- CMake 3.22.1 (or more recent)
8+
- clang 16.0 (or more recent)
99
- [ninja 1.10](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages) (or more recent)
1010

1111
Additional dependencies may be required for your operating system. Please refer to the appropriate
@@ -88,17 +88,17 @@ Options can also be set with the CMake GUI.
8888

8989
Make sure you've installed the following dependencies:
9090

91-
- `clang-14` or higher
91+
- `clang-16` or higher
9292
- `libglu1-mesa-dev`
93-
- `libc++-14-dev` (`libcxx-devel` and `libcxx-static` on Fedora) or higher
94-
- `libc++abi-14-dev` (`libcxxabi-static` on Fedora) or higher
93+
- `libc++-16-dev` (`libcxx-devel` and `libcxx-static` on Fedora) or higher
94+
- `libc++abi-16-dev` (`libcxxabi-static` on Fedora) or higher
9595
- `ninja-build`
9696
- `libxi-dev`
9797
- `libxcomposite-dev` (`libXcomposite-devel` on Fedora)
9898
- `libxxf86vm-dev` (`libXxf86vm-devel` on Fedora)
9999

100100
```shell
101-
sudo apt install clang-14 libglu1-mesa-dev libc++-14-dev libc++abi-14-dev ninja-build libxi-dev libxcomposite-dev libxxf86vm-dev -y
101+
sudo apt install clang-16 libglu1-mesa-dev libc++-16-dev libc++abi-16-dev ninja-build libxi-dev libxcomposite-dev libxxf86vm-dev -y
102102
```
103103

104104
After dependencies have been installed, we highly recommend using the [easy build](#easy-build)
@@ -119,7 +119,7 @@ Your Linux distribution might default to `gcc` instead of `clang`, if that's the
119119
```shell
120120
mkdir out/cmake-release
121121
cd out/cmake-release
122-
# Or use a specific version of clang, for instance /usr/bin/clang-14
122+
# Or use a specific version of clang, for instance /usr/bin/clang-16
123123
CC=/usr/bin/clang CXX=/usr/bin/clang++ CXXFLAGS=-stdlib=libc++ \
124124
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
125125
```
@@ -129,8 +129,8 @@ solution is to use `update-alternatives` to both change the default compiler, an
129129
specific version of clang:
130130

131131
```shell
132-
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
133-
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
132+
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
133+
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
134134
update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
135135
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
136136
```

build/common/versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GITHUB_CLANG_VERSION=14
1+
GITHUB_CLANG_VERSION=16
22
GITHUB_CMAKE_VERSION=3.19.5
33
GITHUB_NINJA_VERSION=1.10.2
44
GITHUB_MESA_VERSION=24.2.1

0 commit comments

Comments
 (0)