| Index: tools/gn/gyp_helper.cc
|
| diff --git a/tools/gn/gyp_helper.cc b/tools/gn/gyp_helper.cc
|
| index f69ed8f2097d29a2b0c22d9795694fe17007b4ae..fb669afd123e7f0f677af1deabb34dd6378c8c3f 100644
|
| --- a/tools/gn/gyp_helper.cc
|
| +++ b/tools/gn/gyp_helper.cc
|
| @@ -45,10 +45,10 @@ SourceFile GypHelper::GetGypFileForTarget(const Target* target,
|
| }
|
|
|
| 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 {
|
|
|