From 8600fb263b71658e2e79c682f6abb991b2139d10 Mon Sep 17 00:00:00 2001 From: Benjamin Buch Date: Wed, 7 Jun 2023 11:53:47 +0200 Subject: cmcldeps: Remove unused C and CXX support We never set `CMAKE_NINJA_CMCLDEPS_{C,CXX}` anymore. --- Source/cmcldeps.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 69eb19e..708c2da 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -262,15 +262,10 @@ int main() 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 + 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 clrest = replace(clrest, "/fo ", "/out:"); clrest = replace(clrest, "-fo ", "-out:"); @@ -288,8 +283,8 @@ int main() } // 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) return exit_code; -- cgit v0.12 From f694e8d9c8176c7c98938031b0be3955fe70166b Mon Sep 17 00:00:00 2001 From: Benjamin Buch Date: Wed, 7 Jun 2023 12:15:06 +0200 Subject: cmcldeps: Do not pass linker flags to cl Avoid cl `Command line warning D9035`. Fixes: #24906 Co-authored-by: Brad King --- Source/cmcldeps.cxx | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 708c2da..2fc1041 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -176,21 +176,6 @@ static void outputDepFile(const std::string& dfile, const std::string& objfile, fclose(out); } -bool contains(const std::string& str, const std::string& what) -{ - return str.find(what) != std::string::npos; -} - -std::string replace(const std::string& str, const std::string& what, - const std::string& replacement) -{ - size_t pos = str.find(what); - if (pos == std::string::npos) - return str; - std::string replaced = str; - return replaced.replace(pos, what.size(), replacement); -} - static int process(cm::string_view srcfilename, const std::string& dfile, const std::string& objfile, const std::string& prefix, const std::string& cmd, const std::string& dir = "", @@ -266,10 +251,11 @@ int main() // "misuse" cl.exe to get headers from .rc files std::string clrest = " /nologo /showIncludes " + rest; - // 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, objfile, objfile + ".dep.obj "); + // rc /fo X.dir\x.rc.res => cl -FoX.dir\x.rc.res.obj + // The object will not actually be written. + cmSystemTools::ReplaceString(clrest, "/fo ", " "); + cmSystemTools::ReplaceString(clrest, "-fo ", " "); + cmSystemTools::ReplaceString(clrest, objfile, "-Fo" + objfile + ".obj"); cl = "\"" + cl + "\" /P /DRC_INVOKED /TC "; -- cgit v0.12 From 0e1abf7afaa381b97cdc1435b42c7cfb00efa4e7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 7 Jun 2023 09:58:52 -0400 Subject: cmcldeps: Avoid passing /nologo more than once to RC compiler `rc /nologo /nologo ...` fails: fatal error RC1106: invalid option: -ologo Fixes: #24974 Inspired-by: Benjamin Buch --- Source/cmcldeps.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 2fc1041..72805d3 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -249,7 +249,16 @@ int main() if (lang == "RC") { // "misuse" cl.exe to get headers from .rc files - std::string clrest = " /nologo /showIncludes " + rest; + + // Make sure there is at most one /nologo option. + bool const haveNologo = (rest.find("/nologo ") != std::string::npos || + rest.find("-nologo ") != std::string::npos); + cmSystemTools::ReplaceString(rest, "-nologo ", " "); + cmSystemTools::ReplaceString(rest, "/nologo ", " "); + std::string clrest = rest; + if (haveNologo) { + rest = "/nologo " + rest; + } // rc /fo X.dir\x.rc.res => cl -FoX.dir\x.rc.res.obj // The object will not actually be written. @@ -257,7 +266,7 @@ int main() cmSystemTools::ReplaceString(clrest, "-fo ", " "); cmSystemTools::ReplaceString(clrest, objfile, "-Fo" + objfile + ".obj"); - cl = "\"" + cl + "\" /P /DRC_INVOKED /TC "; + cl = "\"" + cl + "\" /P /DRC_INVOKED /nologo /showIncludes /TC "; // call cl in object dir so the .i is generated there std::string objdir; -- cgit v0.12