diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-27 13:04:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-27 13:04:10 (GMT) |
| commit | 6887c1174f6a16d6d51189954cb3b0dbf49a971f (patch) | |
| tree | 8d1432fe368a5957204aa0750920ac77dfd5c458 | |
| parent | a7d9666d5d1c9a33ae58bb1f5a95fde57b2c69cc (diff) | |
| parent | 370a6b1bc525aa5b3a7308caf3347dd4b4267db0 (diff) | |
| download | CMake-6887c1174f6a16d6d51189954cb3b0dbf49a971f.zip CMake-6887c1174f6a16d6d51189954cb3b0dbf49a971f.tar.gz CMake-6887c1174f6a16d6d51189954cb3b0dbf49a971f.tar.bz2 | |
Merge topic 'elf-runpath-def'
370a6b1b cmELF: Remove now-redundant check for DT_RUNPATH's existence
7146a604 cmELF: Define DT_RUNPATH if it isn't already defined
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !764
| -rw-r--r-- | Source/cmELF.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 2a8137f..d23abec 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -44,6 +44,9 @@ typedef struct Elf32_Rela Elf32_Rela; #ifdef _SCO_DS #include <link.h> // For DT_SONAME etc. #endif +#ifndef DT_RUNPATH +#define DT_RUNPATH 29 +#endif // Low-level byte swapping implementation. template <size_t s> @@ -154,11 +157,7 @@ public: // Lookup the RUNPATH in the DYNAMIC section. StringEntry const* GetRunPath() { -#if defined(DT_RUNPATH) return this->GetDynamicSectionString(DT_RUNPATH); -#else - return 0; -#endif } // Return the recorded ELF type. |