From 34a338dcc13c520270d5e74ee8a9c953c9724d85 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sun, 2 Mar 2008 16:19:26 -0500 Subject: [PATCH] ENH: In cmSystemTools::ChangeRPath check for the RUNPATH if RPATH does not exist. --- Source/cmSystemTools.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index dbcf775d4..d4dee280a 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2208,7 +2208,12 @@ bool cmSystemTools::ChangeRPath(std::string const& file, std::string rpathSuffix; { cmELF elf(file.c_str()); - if(cmELF::StringEntry const* se = elf.GetRPath()) + cmELF::StringEntry const* se = elf.GetRPath(); + if(!se) + { + se = elf.GetRunPath(); + } + if(se) { // Make sure the current rpath begins with the old rpath. if(se->Value.length() < oldRPath.length() ||