commit 2c29d2dc2781a68c8efa7ffc19e446bf0b8e95ef
author sdefresne <sdefresne@chromium.org> Tue Jul 05 17:24:14 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jul 06 00:26:28 2016 +0000
tree 40a12741f0871a6b90e52ed62836e4b9cc38e2c7
parent 4b8abd9582e6bd503af2c52b71fe483b77b74f68

Stop recursion for create_bundle deps when crossing toolchain.

Only consider the bundle_data target that are defined in the same
toolchain as the create_bundle target in order to allow creation
of multi-arch build using different toolchain.

BUG=603180

Review-Url: https://codereview.chromium.org/2121793003
Cr-Original-Commit-Position: refs/heads/master@{#403832}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 511c073b382d6aafc6b5fd3301cfb287803e9701

tools/gn/target.cc

diff --git a/tools/gn/target.cc b/tools/gn/target.cc
index ddc8ad5..85955a7 100644
--- a/tools/gn/target.cc
+++ b/tools/gn/target.cc
@@ -515,6 +515,10 @@
     if (pair.ptr->output_type() == CREATE_BUNDLE)
       continue;
 
+    // Don't propagate across toolchain.
+    if (pair.ptr->toolchain() != toolchain())
+      continue;
+
     // Direct dependency on a bundle_data target.
     if (pair.ptr->output_type() == BUNDLE_DATA)
       bundle_data_.AddBundleData(pair.ptr);