diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-25 11:26:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-25 11:26:35 (GMT) |
| commit | a6b075c3f8306a6192e66206252d76e2e5925432 (patch) | |
| tree | c42e9c053fe5c0f4f536bb97316ae259bc395052 /Source/cmGeneratorTarget.cxx | |
| parent | 5840b53a0535955cdc66982de8a18ce39d56b460 (diff) | |
| parent | 115ff6a347a96eb77abcd8df5e72e4851dcea414 (diff) | |
| download | CMake-a6b075c3f8306a6192e66206252d76e2e5925432.zip CMake-a6b075c3f8306a6192e66206252d76e2e5925432.tar.gz CMake-a6b075c3f8306a6192e66206252d76e2e5925432.tar.bz2 | |
Merge topic 'import-elf'
115ff6a347 cmELF: Include the ELF parsing code unconditionally
5dfa3ddbe5 cmELF: Allow building without system ELF headers
0da1540aaa cmELF: Fix check for TagMipsRldMapRel
e21188df8b cmELF: Open file explicitly in binary mode
70cdb36d25 Merge branch 'upstream-elf' into import-elf
7a0a37ca41 elf 2021-06-23 (f13da247)
18038042ed cmelf: Add script to import the FreeBSD ELF headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6240
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 34797c5..f1c695f 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2142,7 +2142,6 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const return true; } -#if defined(CMake_USE_ELF_PARSER) || defined(CMake_USE_XCOFF_PARSER) // Enable if the rpath flag uses a separator and the target uses // binaries we know how to edit. std::string ll = this->GetLinkerLanguage(config); @@ -2155,21 +2154,17 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const // CMAKE_EXECUTABLE_FORMAT. if (cmProp fmt = this->Makefile->GetDefinition("CMAKE_EXECUTABLE_FORMAT")) { -# if defined(CMake_USE_ELF_PARSER) if (*fmt == "ELF") { return true; } -# endif -# if defined(CMake_USE_XCOFF_PARSER) +#if defined(CMake_USE_XCOFF_PARSER) if (*fmt == "XCOFF") { return true; } -# endif +#endif } } } -#endif - static_cast<void>(config); return false; } |