Skip to content

Commit 1370ff3

Browse files
jwinarskejwinarske
authored
Merge pull request #13 from meta-flutter/jw/3.19_compat
target-toolchain 3.19.x compat
2 parents c84b33b + 0b7ce03 commit 1370ff3

File tree

3 files changed

+48
-12
lines changed

3 files changed

+48
-12
lines changed

‎.github/workflows/flutter-engine-arm64.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
run: |
6161
export PATH=$PATH:$PWD/../depot_tools
6262
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
63+
CLANG_ROOT=$(find -iname clang++)
64+
CLANG_ROOT=$(dirname $CLANG_ROOT)
65+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
6366
./flutter/tools/gn --runtime-mode=debug \
6467
--embedder-for-target \
6568
--no-build-embedder-examples \
@@ -69,7 +72,7 @@ jobs:
6972
--linux-cpu $linux_cpu \
7073
--target-os linux \
7174
--target-sysroot $PWD/build/linux/$target_sysroot \
72-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
75+
--target-toolchain $PWD/$CLANG_ROOT \
7376
--target-triple $target_triple
7477
ninja -C out/linux_debug_$arch
7578
@@ -105,6 +108,9 @@ jobs:
105108
run: |
106109
export PATH=$PATH:$PWD/../depot_tools
107110
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
111+
CLANG_ROOT=$(find -iname clang++)
112+
CLANG_ROOT=$(dirname $CLANG_ROOT)
113+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
108114
./flutter/tools/gn --runtime-mode=debug \
109115
--unoptimized \
110116
--embedder-for-target \
@@ -115,7 +121,7 @@ jobs:
115121
--linux-cpu $linux_cpu \
116122
--target-os linux \
117123
--target-sysroot $PWD/build/linux/$target_sysroot \
118-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
124+
--target-toolchain $PWD/$CLANG_ROOT \
119125
--target-triple $target_triple
120126
ninja -C out/linux_debug_unopt_$arch
121127
@@ -162,6 +168,9 @@ jobs:
162168
run: |
163169
export PATH=$PATH:$PWD/../depot_tools
164170
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
171+
CLANG_ROOT=$(find -iname clang++)
172+
CLANG_ROOT=$(dirname $CLANG_ROOT)
173+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
165174
./flutter/tools/gn --runtime-mode=release \
166175
--embedder-for-target \
167176
--no-build-embedder-examples \
@@ -171,7 +180,7 @@ jobs:
171180
--linux-cpu $linux_cpu \
172181
--target-os linux \
173182
--target-sysroot $PWD/build/linux/$target_sysroot \
174-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
183+
--target-toolchain $PWD/$CLANG_ROOT \
175184
--target-triple $target_triple
176185
ninja -C out/linux_release_$arch
177186
@@ -207,6 +216,9 @@ jobs:
207216
run: |
208217
export PATH=$PATH:$PWD/../depot_tools
209218
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
219+
CLANG_ROOT=$(find -iname clang++)
220+
CLANG_ROOT=$(dirname $CLANG_ROOT)
221+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
210222
./flutter/tools/gn --runtime-mode=profile \
211223
--embedder-for-target \
212224
--no-build-embedder-examples \
@@ -216,7 +228,7 @@ jobs:
216228
--linux-cpu $linux_cpu \
217229
--target-os linux \
218230
--target-sysroot $PWD/build/linux/$target_sysroot \
219-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
231+
--target-toolchain $PWD/$CLANG_ROOT \
220232
--target-triple $target_triple
221233
ninja -C out/linux_profile_$arch
222234

‎.github/workflows/flutter-engine-armv7hf.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
run: |
6161
export PATH=$PATH:$PWD/../depot_tools
6262
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
63+
CLANG_ROOT=$(find -iname clang++)
64+
CLANG_ROOT=$(dirname $CLANG_ROOT)
65+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
6366
./flutter/tools/gn --runtime-mode=debug \
6467
--embedder-for-target \
6568
--no-build-embedder-examples \
@@ -69,7 +72,7 @@ jobs:
6972
--linux-cpu $linux_cpu \
7073
--target-os linux \
7174
--target-sysroot $PWD/build/linux/$target_sysroot \
72-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
75+
--target-toolchain $PWD/$CLANG_ROOT \
7376
--target-triple $target_triple
7477
7578
ninja -C out/linux_debug_$arch
@@ -106,6 +109,9 @@ jobs:
106109
run: |
107110
export PATH=$PATH:$PWD/../depot_tools
108111
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
112+
CLANG_ROOT=$(find -iname clang++)
113+
CLANG_ROOT=$(dirname $CLANG_ROOT)
114+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
109115
./flutter/tools/gn --runtime-mode=debug \
110116
--unoptimized \
111117
--embedder-for-target \
@@ -116,7 +122,7 @@ jobs:
116122
--linux-cpu $linux_cpu \
117123
--target-os linux \
118124
--target-sysroot $PWD/build/linux/$target_sysroot \
119-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
125+
--target-toolchain $PWD/$CLANG_ROOT \
120126
--target-triple $target_triple
121127
ninja -C out/linux_debug_unopt_$arch
122128
@@ -163,6 +169,9 @@ jobs:
163169
run: |
164170
export PATH=$PATH:$PWD/../depot_tools
165171
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
172+
CLANG_ROOT=$(find -iname clang++)
173+
CLANG_ROOT=$(dirname $CLANG_ROOT)
174+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
166175
./flutter/tools/gn --runtime-mode=release \
167176
--embedder-for-target \
168177
--no-build-embedder-examples \
@@ -172,7 +181,7 @@ jobs:
172181
--linux-cpu $linux_cpu \
173182
--target-os linux \
174183
--target-sysroot $PWD/build/linux/$target_sysroot \
175-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
184+
--target-toolchain $PWD/$CLANG_ROOT \
176185
--target-triple $target_triple
177186
178187
ninja -C out/linux_release_$arch
@@ -209,6 +218,9 @@ jobs:
209218
run: |
210219
export PATH=$PATH:$PWD/../depot_tools
211220
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
221+
CLANG_ROOT=$(find -iname clang++)
222+
CLANG_ROOT=$(dirname $CLANG_ROOT)
223+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
212224
./flutter/tools/gn --runtime-mode=profile \
213225
--embedder-for-target \
214226
--no-build-embedder-examples \
@@ -218,7 +230,7 @@ jobs:
218230
--linux-cpu $linux_cpu \
219231
--target-os linux \
220232
--target-sysroot $PWD/build/linux/$target_sysroot \
221-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
233+
--target-toolchain $PWD/$CLANG_ROOT \
222234
--target-triple $target_triple
223235
ninja -C out/linux_profile_$arch
224236

‎.github/workflows/flutter-engine-x86_64.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ jobs:
5757
run: |
5858
export PATH=$PATH:$PWD/../depot_tools
5959
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
60+
CLANG_ROOT=$(find -iname clang++)
61+
CLANG_ROOT=$(dirname $CLANG_ROOT)
62+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
6063
./flutter/tools/gn --runtime-mode=debug \
6164
--embedder-for-target \
6265
--no-build-embedder-examples \
@@ -66,7 +69,7 @@ jobs:
6669
--linux-cpu $linux_cpu \
6770
--target-os linux \
6871
--target-sysroot $PWD/build/linux/$target_sysroot \
69-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
72+
--target-toolchain $PWD/$CLANG_ROOT \
7073
--target-triple $target_triple
7174
ninja -C out/linux_debug_$arch
7275
@@ -102,6 +105,9 @@ jobs:
102105
run: |
103106
export PATH=$PATH:$PWD/../depot_tools
104107
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
108+
CLANG_ROOT=$(find -iname clang++)
109+
CLANG_ROOT=$(dirname $CLANG_ROOT)
110+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
105111
./flutter/tools/gn --runtime-mode=debug \
106112
--unoptimized \
107113
--embedder-for-target \
@@ -112,7 +118,7 @@ jobs:
112118
--linux-cpu $linux_cpu \
113119
--target-os linux \
114120
--target-sysroot $PWD/build/linux/$target_sysroot \
115-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
121+
--target-toolchain $PWD/$CLANG_ROOT \
116122
--target-triple $target_triple
117123
ninja -C out/linux_debug_unopt_$arch
118124
@@ -159,6 +165,9 @@ jobs:
159165
run: |
160166
export PATH=$PATH:$PWD/../depot_tools
161167
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
168+
CLANG_ROOT=$(find -iname clang++)
169+
CLANG_ROOT=$(dirname $CLANG_ROOT)
170+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
162171
./flutter/tools/gn --runtime-mode=release \
163172
--embedder-for-target \
164173
--no-build-embedder-examples \
@@ -168,7 +177,7 @@ jobs:
168177
--linux-cpu $linux_cpu \
169178
--target-os linux \
170179
--target-sysroot $PWD/build/linux/$target_sysroot \
171-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
180+
--target-toolchain $PWD/$CLANG_ROOT \
172181
--target-triple $target_triple
173182
ninja -C out/linux_release_$arch
174183
@@ -204,6 +213,9 @@ jobs:
204213
run: |
205214
export PATH=$PATH:$PWD/../depot_tools
206215
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
216+
CLANG_ROOT=$(find -iname clang++)
217+
CLANG_ROOT=$(dirname $CLANG_ROOT)
218+
export CLANG_ROOT=$(dirname $CLANG_ROOT)
207219
./flutter/tools/gn --runtime-mode=profile \
208220
--embedder-for-target \
209221
--no-build-embedder-examples \
@@ -213,7 +225,7 @@ jobs:
213225
--linux-cpu $linux_cpu \
214226
--target-os linux \
215227
--target-sysroot $PWD/build/linux/$target_sysroot \
216-
--target-toolchain $PWD/flutter/buildtools/linux-x64/clang \
228+
--target-toolchain $PWD/$CLANG_ROOT \
217229
--target-triple $target_triple
218230
ninja -C out/linux_profile_$arch
219231

0 commit comments

Comments
 (0)