Skip to content

Commit 2ac5f1c

Browse files
authored
[ci] Change llvm-12 to llvm-17 (#81)
1 parent 45ccc85 commit 2ac5f1c

File tree

4 files changed

+19
-32
lines changed

4 files changed

+19
-32
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Install dependencies
3232
run: |
3333
sudo apt-get update
34-
sudo apt-get install -y clang-12 rpm2cpio cpio binutils-${{ matrix.triple }}
34+
sudo apt-get install -y clang-17 rpm2cpio cpio binutils-${{ matrix.triple }}
3535
3636
- name: Install depot_tools
3737
run: |
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
src/tools/gn \
5858
--target-cpu ${{ matrix.arch }} \
59-
--target-toolchain /usr/lib/llvm-12 \
59+
--target-toolchain /usr/lib/llvm-17 \
6060
--target-sysroot src/sysroot-6.0/${{ matrix.arch }} \
6161
--target-dir build
6262
ninja -C src/out/build
@@ -66,7 +66,7 @@ jobs:
6666
run: |
6767
src/tools/gn \
6868
--target-cpu ${{ matrix.arch }} \
69-
--target-toolchain /usr/lib/llvm-12 \
69+
--target-toolchain /usr/lib/llvm-17 \
7070
--target-sysroot src/sysroot-6.5/${{ matrix.arch }} \
7171
--api-version 6.5 \
7272
--target-dir build

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ The Flutter embedder for Tizen.
1010

1111
- Linux (x64)
1212
- [depot_tools](https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up)
13-
- [LLVM](https://apt.llvm.org) (10 or later)
14-
- `sudo apt install clang-12`
13+
- [LLVM](https://apt.llvm.org) (17 or later)
14+
- `sudo apt install clang-17`
1515
- Additional dependencies
1616
- `sudo apt install git python3 rpm2cpio cpio`
1717
- `sudo apt install binutils-arm-linux-gnueabi binutils-aarch64-linux-gnu binutils-i686-linux-gnu`
@@ -37,21 +37,21 @@ The Flutter embedder for Tizen.
3737
- **For arm**
3838

3939
```sh
40-
tools/gn --target-cpu arm --target-toolchain /usr/lib/llvm-12
40+
tools/gn --target-cpu arm --target-toolchain /usr/lib/llvm-17
4141
ninja -C out/tizen_arm
4242
```
4343

4444
- **For arm64**
4545

4646
```sh
47-
tools/gn --target-cpu arm64 --target-toolchain /usr/lib/llvm-12
47+
tools/gn --target-cpu arm64 --target-toolchain /usr/lib/llvm-17
4848
ninja -C out/tizen_arm64
4949
```
5050

5151
- **For x86**
5252

5353
```sh
54-
tools/gn --target-cpu x86 --target-toolchain /usr/lib/llvm-12
54+
tools/gn --target-cpu x86 --target-toolchain /usr/lib/llvm-17
5555
ninja -C out/tizen_x86
5656
```
5757

build/config/BUILD.gn

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ config("compiler") {
3737
# Stack protection.
3838
cflags += [
3939
"-fstack-protector",
40-
"--param=ssp-buffer-size=4",
40+
41+
# 8 is the default, but make this explicit here so that we don't have to
42+
# go hunting for the flag name if we ever want a value that is
43+
# different from the default.
44+
"--param=ssp-buffer-size=8",
4145
]
4246

4347
# Cross compilation.
@@ -75,24 +79,15 @@ config("compiler") {
7579
"-Werror",
7680
"-Wno-missing-field-initializers",
7781
"-Wno-unused-parameter",
82+
"-Wno-unused-but-set-parameter",
83+
"-Wno-unused-but-set-variable",
7884
"-Wno-implicit-int-float-conversion",
79-
"-Wno-c99-designator",
8085
"-Wno-deprecated-copy",
86+
"-Wno-psabi",
87+
"-Wno-unqualified-std-cast-call",
88+
"-Wno-non-c-typedef-for-linkage",
8189
"-Wno-range-loop-construct",
8290
]
83-
if (clang_version >= 11) {
84-
cflags += [ "-Wno-psabi" ]
85-
}
86-
if (clang_version >= 14) {
87-
cflags += [
88-
"-Wno-unused-but-set-parameter",
89-
"-Wno-unused-but-set-variable",
90-
"-Wno-non-c-typedef-for-linkage",
91-
]
92-
}
93-
if (clang_version >= 15) {
94-
cflags += [ "-Wno-unqualified-std-cast-call" ]
95-
}
9691

9792
# Extra warnings.
9893
cflags += [
@@ -108,14 +103,6 @@ config("cxx_version_default") {
108103
cflags_cc = [ "-std=c++17" ]
109104
}
110105

111-
config("cxx_version_11") {
112-
cflags_cc = [ "-std=c++11" ]
113-
}
114-
115-
config("cxx_version_20") {
116-
cflags_cc = [ "-std=c++20" ]
117-
}
118-
119106
config("no_system_cxx") {
120107
cflags_cc = [ "-nostdinc++" ]
121108
ldflags = [ "-nostdlib++" ]

build/config/BUILDCONFIG.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ declare_args() {
2424
target_triple = ""
2525

2626
# The compiler version.
27-
clang_version = 10
27+
clang_version = 17
2828

2929
# The target API version.
3030
api_version = ""

0 commit comments

Comments
 (0)