From 0b7ce038145f9668b17011568dd36a4e25ef5036 Mon Sep 17 00:00:00 2001 From: Joel Winarske Date: Mon, 2 Sep 2024 10:48:35 -0700 Subject: [PATCH] target-toolchain 3.19.x compat -discover path with find -iname clang++ Signed-off-by: Joel Winarske --- .github/workflows/flutter-engine-arm64.yaml | 20 +++++++++++++++---- .github/workflows/flutter-engine-armv7hf.yaml | 20 +++++++++++++++---- .github/workflows/flutter-engine-x86_64.yaml | 20 +++++++++++++++---- 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/.github/workflows/flutter-engine-arm64.yaml b/.github/workflows/flutter-engine-arm64.yaml index 429894b..85f8ee0 100644 --- a/.github/workflows/flutter-engine-arm64.yaml +++ b/.github/workflows/flutter-engine-arm64.yaml @@ -60,6 +60,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=debug \ --embedder-for-target \ --no-build-embedder-examples \ @@ -69,7 +72,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_debug_$arch @@ -105,6 +108,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=debug \ --unoptimized \ --embedder-for-target \ @@ -115,7 +121,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_debug_unopt_$arch @@ -162,6 +168,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=release \ --embedder-for-target \ --no-build-embedder-examples \ @@ -171,7 +180,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_release_$arch @@ -207,6 +216,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=profile \ --embedder-for-target \ --no-build-embedder-examples \ @@ -216,7 +228,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_profile_$arch diff --git a/.github/workflows/flutter-engine-armv7hf.yaml b/.github/workflows/flutter-engine-armv7hf.yaml index 50a366b..45fffbf 100644 --- a/.github/workflows/flutter-engine-armv7hf.yaml +++ b/.github/workflows/flutter-engine-armv7hf.yaml @@ -60,6 +60,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=debug \ --embedder-for-target \ --no-build-embedder-examples \ @@ -69,7 +72,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_debug_$arch @@ -106,6 +109,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=debug \ --unoptimized \ --embedder-for-target \ @@ -116,7 +122,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_debug_unopt_$arch @@ -163,6 +169,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=release \ --embedder-for-target \ --no-build-embedder-examples \ @@ -172,7 +181,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_release_$arch @@ -209,6 +218,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=profile \ --embedder-for-target \ --no-build-embedder-examples \ @@ -218,7 +230,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_profile_$arch diff --git a/.github/workflows/flutter-engine-x86_64.yaml b/.github/workflows/flutter-engine-x86_64.yaml index f2ade8c..1569c02 100644 --- a/.github/workflows/flutter-engine-x86_64.yaml +++ b/.github/workflows/flutter-engine-x86_64.yaml @@ -57,6 +57,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=debug \ --embedder-for-target \ --no-build-embedder-examples \ @@ -66,7 +69,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_debug_$arch @@ -102,6 +105,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=debug \ --unoptimized \ --embedder-for-target \ @@ -112,7 +118,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_debug_unopt_$arch @@ -159,6 +165,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=release \ --embedder-for-target \ --no-build-embedder-examples \ @@ -168,7 +177,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_release_$arch @@ -204,6 +213,9 @@ jobs: run: | export PATH=$PATH:$PWD/../depot_tools export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython + CLANG_ROOT=$(find -iname clang++) + CLANG_ROOT=$(dirname $CLANG_ROOT) + export CLANG_ROOT=$(dirname $CLANG_ROOT) ./flutter/tools/gn --runtime-mode=profile \ --embedder-for-target \ --no-build-embedder-examples \ @@ -213,7 +225,7 @@ jobs: --linux-cpu $linux_cpu \ --target-os linux \ --target-sysroot $PWD/build/linux/$target_sysroot \ - --target-toolchain $PWD/flutter/buildtools/linux-x64/clang \ + --target-toolchain $PWD/$CLANG_ROOT \ --target-triple $target_triple ninja -C out/linux_profile_$arch