ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor improvements for mac dyld linker. 

Minor code improvements.

Do not suppress output of sudo invocation, this may cause it hang on an
invisible password prompt.

- Fix #676.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2020-06-05 03:36:59 -07:00
parent 7c0c53a332
commit d8da93897a
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/osx/third_party_libs_tool
View File

@ -66,7 +66,7 @@ main() {
frameworks="$app_bundle/Contents/Frameworks" frameworks="$app_bundle/Contents/Frameworks"
mkdir -p "$frameworks" 2>/dev/null mkdir -p "$frameworks"
scan_libs "$@" | fully_resolve_links | sort -u | \ scan_libs "$@" | fully_resolve_links | sort -u | \
while read lib; do while read lib; do
@ -147,8 +147,7 @@ lib_scan() {
IFS=' IFS='
' '
for lib in $(otool -L "$bin" 2>/dev/null \ for lib in $(otool -L "$bin" 2>/dev/null \
| awk '/^([^ \t]|([ \t]*\/(System|usr\/lib)\/))/ { next } \ | sed -E '1d; s/^[[:space:]]*//; \,^(/System|/usr/lib),d; s/[[:space:]]+\([^()]+\)[[:space:]]*$//'); do
{ sub("^[ \t]*", ""); sub("[ \t]*\\(.*\\)[ \t]*$", ""); print }'); do
[ "$lib" = "$bin" ] && continue [ "$lib" = "$bin" ] && continue
@ -297,8 +296,7 @@ install_name_tool() {
if ! command install_name_tool "$@" >"$out_file" 2>&1; then if ! command install_name_tool "$@" >"$out_file" 2>&1; then
if grep -Eq -i 'permission denied|bad file descriptor' "$out_file"; then if grep -Eq -i 'permission denied|bad file descriptor' "$out_file"; then
if ! command sudo install_name_tool "$@" >"$out_file" 2>&1; then if ! command sudo install_name_tool "$@"; then
cat "$out_file" >&2
return 1 return 1
fi fi
elif ! grep -Eq -i 'would duplicate path' "$out_file"; then elif ! grep -Eq -i 'would duplicate path' "$out_file"; then