| Index: tools/gn/ninja_helper.cc
|
| diff --git a/tools/gn/ninja_helper.cc b/tools/gn/ninja_helper.cc
|
| index f84d2b1dc7c61848563cd5ea68134b217c3176a9..e5d1ff8efa1be39e6133cac40f74eb83adaedf2b 100644
|
| --- a/tools/gn/ninja_helper.cc
|
| +++ b/tools/gn/ninja_helper.cc
|
| @@ -212,23 +212,16 @@ std::string NinjaHelper::GetRuleForSourceType(const Settings* settings,
|
| return prefix + "cc";
|
| if (type == SOURCE_CC)
|
| return prefix + "cxx";
|
| + if (type == SOURCE_M)
|
| + return prefix + "objc";
|
| + if (type == SOURCE_MM)
|
| + return prefix + "objcxx";
|
| + if (type == SOURCE_RC)
|
| + return prefix + "rc";
|
| + if (type == SOURCE_S)
|
| + return prefix + "cc"; // Assembly files just get compiled by CC.
|
|
|
| // TODO(brettw) asm files.
|
|
|
| - if (settings->IsMac()) {
|
| - if (type == SOURCE_M)
|
| - return prefix + "objc";
|
| - if (type == SOURCE_MM)
|
| - return prefix + "objcxx";
|
| - }
|
| -
|
| - if (settings->IsWin()) {
|
| - if (type == SOURCE_RC)
|
| - return prefix + "rc";
|
| - } else {
|
| - if (type == SOURCE_S)
|
| - return prefix + "cc"; // Assembly files just get compiled by CC.
|
| - }
|
| -
|
| return std::string();
|
| }
|
|
|