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