Browse Source

Merge topic 'makefile-fix-verbose' into release-3.18

7f78bc42cb Makefile: Fix regression in .SILENT rule

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4928
Brad King 5 years ago
parent
commit
22dbe547fb
1 changed files with 4 additions and 3 deletions
  1. 4 3
      Source/cmLocalUnixMakefileGenerator3.cxx

+ 4 - 3
Source/cmLocalUnixMakefileGenerator3.cxx

@@ -713,9 +713,10 @@ void cmLocalUnixMakefileGenerator3::WriteSpecialTargetsTop(
     // "VERBOSE=1" to be added as a make variable which will change the
     // name of this special target.  This gives a make-time choice to
     // the user.
-    this->WriteMakeRule(makefileStream,
-                        "Suppress display of executed commands.",
-                        "$(VERBOSE).SILENT", no_depends, no_commands, false);
+    // Write directly to the stream since WriteMakeRule escapes '$'.
+    makefileStream << "#Suppress display of executed commands.\n"
+                      "$(VERBOSE).SILENT:\n"
+                      "\n";
   }
 
   // Work-around for makes that drop rules that have no dependencies