summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-03-23 14:34:07 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-03-23 14:34:50 (GMT)
commit5e4396dd21107b96f7c931f206614e24404fe61c (patch)
tree921656ea2ce1640a398e58eabe733393c1d00bed
parent3d9aa96fcac26901fb1a24fca7d589801c36df87 (diff)
parent4a9fb82030cb44264be398a668ef14219fdebf5f (diff)
downloadCMake-5e4396dd21107b96f7c931f206614e24404fe61c.zip
CMake-5e4396dd21107b96f7c931f206614e24404fe61c.tar.gz
CMake-5e4396dd21107b96f7c931f206614e24404fe61c.tar.bz2
Merge topic 'doc-xcoff-chrpath' into release-3.20
4a9fb82030 Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5925
-rw-r--r--Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst19
1 files changed, 13 insertions, 6 deletions
diff --git a/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst b/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
index 189f59f..b9b045e 100644
--- a/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
+++ b/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
@@ -1,10 +1,17 @@
CMAKE_NO_BUILTIN_CHRPATH
------------------------
-Do not use the builtin ELF editor to fix RPATHs on installation.
+Do not use the builtin binary editor to fix runtime library search
+paths on installation.
-When an ELF binary needs to have a different RPATH after installation
-than it does in the build tree, CMake uses a builtin editor to change
-the RPATH in the installed copy. If this variable is set to true then
-CMake will relink the binary before installation instead of using its
-builtin editor.
+When an ELF or XCOFF binary needs to have a different runtime library
+search path after installation than it does in the build tree, CMake uses
+a builtin editor to change the runtime search path in the installed copy.
+If this variable is set to true then CMake will relink the binary before
+installation instead of using its builtin editor.
+
+.. versionadded:: 3.20
+
+ This variable also applies to XCOFF binaries' LIBPATH. Prior to the
+ addition of the XCOFF editor in CMake 3.20, this variable applied only
+ to ELF binaries' RPATH/RUNPATH.