|
@@ -69,9 +69,17 @@ function(gp_file_type original_file file type_var)
|
|
|
endif("${file}" MATCHES "^@(executable|loader)_path")
|
|
endif("${file}" MATCHES "^@(executable|loader)_path")
|
|
|
|
|
|
|
|
if(NOT is_embedded)
|
|
if(NOT is_embedded)
|
|
|
- if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
|
|
|
|
|
- set(is_system 1)
|
|
|
|
|
- endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
|
|
|
|
|
|
|
+ if(UNIX)
|
|
|
|
|
+ if("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
|
|
|
|
|
+ set(is_system 1)
|
|
|
|
|
+ endif("${file}" MATCHES "^(/lib/|/lib32/|/lib64/)")
|
|
|
|
|
+ endif(UNIX)
|
|
|
|
|
+
|
|
|
|
|
+ if(APPLE)
|
|
|
|
|
+ if("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
|
|
|
|
|
+ set(is_system 1)
|
|
|
|
|
+ endif("${file}" MATCHES "^(/System/Library/|/usr/lib/)")
|
|
|
|
|
+ endif(APPLE)
|
|
|
|
|
|
|
|
if(WIN32)
|
|
if(WIN32)
|
|
|
string(TOLOWER "$ENV{SystemRoot}" sysroot)
|
|
string(TOLOWER "$ENV{SystemRoot}" sysroot)
|
|
@@ -406,7 +414,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
|
|
|
|
|
|
|
|
if("${gp_tool}" STREQUAL "ldd")
|
|
if("${gp_tool}" STREQUAL "ldd")
|
|
|
set(gp_cmd_args "")
|
|
set(gp_cmd_args "")
|
|
|
- set(gp_regex "^\t([\t ]+)[\t ].*${eol_char}$")
|
|
|
|
|
|
|
+ set(gp_regex "^[\t ]*[^\t ]+ => ([^\t ]+).*${eol_char}$")
|
|
|
set(gp_regex_cmp_count 1)
|
|
set(gp_regex_cmp_count 1)
|
|
|
set(gp_tool_known 1)
|
|
set(gp_tool_known 1)
|
|
|
endif("${gp_tool}" STREQUAL "ldd")
|
|
endif("${gp_tool}" STREQUAL "ldd")
|