Skip to content

Commit da055c7

Browse files
LongCatIsLooonggspencergoog
authored andcommitted
Use buildroot clang for scenario app (flutter#21690)
1 parent 8b5170a commit da055c7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

testing/scenario_app/compile_ios_jit.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,15 @@ echo "Compiling JIT Snapshot..."
8585

8686
cp "$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" "$OUTDIR/App.framework/flutter_assets/vm_snapshot_data"
8787

88+
LLVM_BIN_PATH="${SCRIPT_DIR}/../../../buildtools/mac-x64/clang/bin"
8889
SYSROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
8990
echo "Using $SYSROOT as sysroot."
9091

9192
echo "Creating stub App using $SYSROOT..."
9293

93-
echo "static const int Moo = 88;" | xcrun clang -x c \
94+
# Use buildroot clang so we can override the linker to use in our LUCI recipe.
95+
# See: https://github.com/flutter/flutter/issues/65901
96+
echo "static const int Moo = 88;" | "$LLVM_BIN_PATH/clang" -x c \
9497
-arch x86_64 \
9598
-fembed-bitcode-marker \
9699
-isysroot "$SYSROOT" \
@@ -110,4 +113,3 @@ rm -rf "$SCRIPT_DIR/ios/Scenarios/App.framework"
110113
rm -rf "$SCRIPT_DIR/ios/Scenarios/Flutter.framework"
111114
cp -R "$OUTDIR/App.framework" "$SCRIPT_DIR/ios/Scenarios"
112115
cp -R "$DEVICE_TOOLS/../Flutter.framework" "$SCRIPT_DIR/ios/Scenarios"
113-

0 commit comments

Comments
 (0)