diff options
| author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-06-17 14:22:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-06-24 14:57:51 (GMT) |
| commit | 115ff6a347a96eb77abcd8df5e72e4851dcea414 (patch) | |
| tree | 925a33815ef6168c56eeec955ac4f356256ddf64 /Source/cmGeneratorTarget.cxx | |
| parent | 5dfa3ddbe592add43e2985dad772f6aa44d37c0b (diff) | |
| download | CMake-115ff6a347a96eb77abcd8df5e72e4851dcea414.zip CMake-115ff6a347a96eb77abcd8df5e72e4851dcea414.tar.gz CMake-115ff6a347a96eb77abcd8df5e72e4851dcea414.tar.bz2 | |
cmELF: Include the ELF parsing code unconditionally
Now that the ELF definitions are provided on all platforms there is no
need to keep the CMake_USE_ELF_PARSER option.
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 f268c6c..aff32a4 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; } |