Skip to content

Commit 761edd7

Browse files
committed
fix: do not restrict gclient sync to the target platform deps
--deps=android drops the host DEPS entries along with the other platforms', and the linux sysroot hook is one of them. gn gen then fails with "Missing sysroot (//build/linux/debian_bullseye_amd64-sysroot)" for //build/toolchain/linux:clang_x64 -- the host toolchain torque and mksnapshot are built with, which every Android target needs. target_os in .gclient already selects the target deps; keeping the host ones as well is the point.
1 parent 4290566 commit 761edd7

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

scripts/matrix/fetch.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,13 @@ elif ! grep -q "'$PLATFORM'" .gclient; then
6363
fi
6464

6565
checkpoint "Syncing"
66-
gclient sync --deps="$PLATFORM" --reset --with_branch_head \
66+
# No --deps here on purpose. Restricting the DEPS OS list to the target platform
67+
# also drops the *host* entries, and the linux sysroot hook is one of them --
68+
# which then fails gn gen with "Missing sysroot
69+
# (//build/linux/debian_bullseye_amd64-sysroot)" for the host toolchain that
70+
# torque and mksnapshot are built with. target_os in .gclient already selects
71+
# the target deps, and additionally keeping the host ones is what we want.
72+
gclient sync --reset --with_branch_head \
6773
--revision "$V8_VERSION" --delete_unversioned_trees
6874

6975
checkpoint "Patching"

0 commit comments

Comments
 (0)