forked from pool/cmake
This commit is contained in:
parent
fb770b7cbd
commit
da3833fe85
@ -2,12 +2,15 @@ investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881
|
|||||||
|
|
||||||
--- cmake-3.24.1/Modules/GetPrerequisites.cmake
|
--- cmake-3.24.1/Modules/GetPrerequisites.cmake
|
||||||
+++ cmake-3.24.1/Modules/GetPrerequisites.cmake
|
+++ cmake-3.24.1/Modules/GetPrerequisites.cmake
|
||||||
@@ -514,7 +514,7 @@
|
@@ -730,9 +730,9 @@ function(get_prerequisites target prereq
|
||||||
string(TOLOWER "${resolved_file}" lower)
|
|
||||||
|
if(gp_tool MATCHES "ldd$")
|
||||||
if(UNIX)
|
set(gp_cmd_args "")
|
||||||
- if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)")
|
- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$")
|
||||||
+ if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/|linux-vdso\\.so)")
|
+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$")
|
||||||
set(is_system 1)
|
set(gp_regex_error "not found${eol_char}$")
|
||||||
endif()
|
- set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
|
||||||
endif()
|
+ set(gp_regex_fallback "^[\t ]*([^\t ]+) => (/[^\t ]+).*${eol_char}$")
|
||||||
|
set(gp_regex_cmp_count 1)
|
||||||
|
elseif(gp_tool MATCHES "otool$")
|
||||||
|
set(gp_cmd_args "-L")
|
||||||
|
Loading…
Reference in New Issue
Block a user