Revert 232657 "GN: toolchain threading cleanup"

trunk/src/tools/gn/gyp_helper.cc

Index: trunk/src/tools/gn/gyp_helper.cc
===================================================================
--- trunk/src/tools/gn/gyp_helper.cc	(revision 232660)
+++ trunk/src/tools/gn/gyp_helper.cc	(working copy)
@@ -45,10 +45,10 @@
 }
 
 std::string GypHelper::GetNameForTarget(const Target* target) const {
-  if (target->settings()->is_default())
+  const Toolchain* toolchain = target->settings()->toolchain();
+  if (toolchain->is_default())
     return target->label().name();  // Default toolchain has no suffix.
-  return target->label().name() + "_" +
-         target->settings()->toolchain_label().name();
+  return target->label().name() + "_" + toolchain->label().name();
 }
 
 std::string GypHelper::GetFullRefForTarget(const Target* target) const {