ソースを参照

cmcldeps: Remove unused C and CXX support

We never set `CMAKE_NINJA_CMCLDEPS_{C,CXX}` anymore.
Benjamin Buch 2 年 前
コミット
8600fb263b
1 ファイル変更4 行追加9 行削除
  1. 4 9
      Source/cmcldeps.cxx

+ 4 - 9
Source/cmcldeps.cxx

@@ -262,15 +262,10 @@ int main()
     srcfilename = srcfilename.substr(pos + 1);
     srcfilename = srcfilename.substr(pos + 1);
   }
   }
 
 
-  std::string nol = " /nologo ";
-  std::string show = " /showIncludes ";
-  if (lang == "C" || lang == "CXX") {
-    return process(srcfilename, dfile, objfile, prefix,
-                   binpath + nol + show + rest);
-  } else if (lang == "RC") {
+  if (lang == "RC") {
     // "misuse" cl.exe to get headers from .rc files
     // "misuse" cl.exe to get headers from .rc files
+    std::string clrest = " /nologo /showIncludes " + rest;
 
 
-    std::string clrest = rest;
     // rc: /fo x.dir\x.rc.res  ->  cl: /out:x.dir\x.rc.res.dep.obj
     // rc: /fo x.dir\x.rc.res  ->  cl: /out:x.dir\x.rc.res.dep.obj
     clrest = replace(clrest, "/fo ", "/out:");
     clrest = replace(clrest, "/fo ", "/out:");
     clrest = replace(clrest, "-fo ", "-out:");
     clrest = replace(clrest, "-fo ", "-out:");
@@ -288,8 +283,8 @@ int main()
     }
     }
 
 
     // extract dependencies with cl.exe
     // extract dependencies with cl.exe
-    int exit_code = process(srcfilename, dfile, objfile, prefix,
-                            cl + nol + show + clrest, objdir, true);
+    int exit_code =
+      process(srcfilename, dfile, objfile, prefix, cl + clrest, objdir, true);
 
 
     if (exit_code != 0)
     if (exit_code != 0)
       return exit_code;
       return exit_code;