diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-23 12:51:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-03-26 11:34:24 (GMT) |
| commit | d6d9da5178e944e66330156a1292e621235eda05 (patch) | |
| tree | bc446ac9027fa49d9922a7914529bdbf9f567913 | |
| parent | b7d8c91822101ff9de07075e9b1f02e18c2725da (diff) | |
| download | CMake-d6d9da5178e944e66330156a1292e621235eda05.zip CMake-d6d9da5178e944e66330156a1292e621235eda05.tar.gz CMake-d6d9da5178e944e66330156a1292e621235eda05.tar.bz2 | |
Makefiles: Fix silencing of nested calls for GNU make 4.3
Since GNU make 4.3, `.SILENT:` no longer causes nested `$(MAKE)` calls
to get `-s` implicitly. Add the `-s` flag explicitly on such calls to
suppress messages about Entering/Leaving directories.
Fixes: #20487
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 4a70248..919fb74 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -712,6 +712,10 @@ void cmLocalUnixMakefileGenerator3::WriteSpecialTargetsTop( ; /* clang-format on */ } else { + makefileStream << "# Command-line flag to silence nested $(MAKE).\n" + "$(VERBOSE)MAKESILENT = -s\n" + "\n"; + // Write special target to silence make output. This must be after // the default target in case VERBOSE is set (which changes the // name). The setting of CMAKE_VERBOSE_MAKEFILE to ON will cause a @@ -1910,7 +1914,7 @@ std::string cmLocalUnixMakefileGenerator3::GetRecursiveMakeCall( { // Call make on the given file. std::string cmd = cmStrCat( - "$(MAKE) -f ", + "$(MAKE) $(MAKESILENT) -f ", this->ConvertToOutputFormat(makefile, cmOutputConverter::SHELL), ' '); cmGlobalUnixMakefileGenerator3* gg = |