mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'file-READ_ELF-capture-error'

Browse Source 
41bebbe50a file: Restore error capture in undocumented READ_ELF mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6853
This commit is contained in:
Brad King
2022-01-12 14:45:00 +00:00
committed by Kitware Robot
parent c7af954770 41bebbe50a
commit d009622769
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileCommand.cxx
+8 -3
View File
@@ -1211,9 +1211,14 @@ bool HandleReadElfCommand(std::vector<std::string> const& args,
cmELF elf(fileNameArg.c_str());
if (!elf) {
status.SetError(cmStrCat("READ_ELF given FILE \"", fileNameArg,
"\" that is not a valid ELF file."));
return false;
if (arguments.Error.empty()) {
status.SetError(cmStrCat("READ_ELF given FILE:\n ", fileNameArg,
"\nthat is not a valid ELF file."));
return false;
}
status.GetMakefile().AddDefinition(arguments.Error,
"not a valid ELF file");
return true;
}
if (!arguments.RPath.empty()) {