summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2023-02-20 11:51:37 (GMT)
committerBrad King <brad.king@kitware.com>2023-02-20 14:30:40 (GMT)
commitcf2ad9995aa076b17024a76344d1f3580ea7b4f4 (patch)
tree47d068fc0ee11135d285cdb64be1181a5803d394
parent9fc1ce97a83ead054f58eb0dca2e639acee5b6ad (diff)
downloadCMake-cf2ad9995aa076b17024a76344d1f3580ea7b4f4.zip
CMake-cf2ad9995aa076b17024a76344d1f3580ea7b4f4.tar.gz
CMake-cf2ad9995aa076b17024a76344d1f3580ea7b4f4.tar.bz2
GetPrerequisites: Ignore relative paths printed by ldd
On x86 Linux, the ldd output for its vDSO (linux-gate.so.1) is a bit different from other Linux with standard vDSO name (linux-vdso.so.1). $ ldd /bin/ls linux-gate.so.1 => linux-gate.so.1 (0xf7f5e000) libcap.so.2 => /usr/lib32/libcap.so.2 (0xf7f22000) libc.so.6 => /usr/lib32/libc.so.6 (0xf7cfb000) /lib/ld-linux.so.2 => /usr/lib32/ld-linux.so.2 (0xf7f60000) This fixes the `Tests/BundleUtilities` test on x86 Linux.
-rw-r--r--Modules/GetPrerequisites.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 0ba35b6..0cd49ab 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -730,7 +730,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
if(gp_tool MATCHES "ldd$")
set(gp_cmd_args "")
- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$")
+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$")
set(gp_regex_error "not found${eol_char}$")
set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
set(gp_regex_cmp_count 1)