GN: toolchain threading cleanup

tools/gn/gyp_helper.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/gyp_helper.h"
 
 #include "tools/gn/err.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/source_file.h"
@@ skipping 27 matching lines @@
     *err = Err(Location(), "Need to specify a gyp_file value for " +
         target->label().GetUserVisibleName(false) + "\n"
         "since I can't make up one with no name.");
     return SourceFile();
   }
 
   return SourceFile(dir + dir_name + ".gyp");
 }
 
 std::string GypHelper::GetNameForTarget(const Target* target) const {
-  const Toolchain* toolchain = target->settings()->toolchain();
-  if (toolchain->is_default())
+  if (target->settings()->is_default())
     return target->label().name();  // Default toolchain has no suffix.
-  return target->label().name() + "_" + toolchain->label().name();
+  return target->label().name() + "_" +
+         target->settings()->toolchain_label().name();
 }
 
 std::string GypHelper::GetFullRefForTarget(const Target* target) const {
   Err err;
   SourceFile gypfile = GetGypFileForTarget(target, &err);
   CHECK(gypfile.is_source_absolute()) <<
       "GYP files should not be system-absolute: " << gypfile.value();
 
   std::string ret("<(DEPTH)/");
   // Trim off the leading double-slash.
@@ skipping 34 matching lines @@
     ret.append(&dir.value()[2], dir.value().size() - 2);
   }
 
   // Optionally trim the slash off the end.
   if (!ret.empty() && !include_slash &&
       (ret[ret.size() - 1] == '/' || ret[ret.size() - 1] == '\\'))
     ret.resize(ret.size() - 1);
 
   return ret;
 }