Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1191)

Unified Diff: build/linux/sysroot_ld_path.sh

Issue 19044004: Fix "No such file or directory" error in sysroot_ld_path.sh if ld.so.conf include pattern doesn't m… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/sysroot_ld_path.sh
diff --git a/build/linux/sysroot_ld_path.sh b/build/linux/sysroot_ld_path.sh
index fd0bb928a625e00a29a5da5fcafa61c18657514f..74553c93638729265423a74e023956608afcca69 100755
--- a/build/linux/sysroot_ld_path.sh
+++ b/build/linux/sysroot_ld_path.sh
@@ -46,14 +46,16 @@ process_ld_so_conf() {
echo "$ENTRY" | grep -qs ^include
if [ $? -eq 0 ]; then
local included_files=$(echo "$ENTRY" | sed 's/^include //')
- for inc_file in $included_files; do
- echo $inc_file | grep -qs ^/
- if [ $? -eq 0 ]; then
- process_ld_so_conf "$root" "$root$inc_file"
- else
- process_ld_so_conf "$root" "$(pwd)/$inc_file"
- fi
- done
+ if ls $included_files >/dev/null 2>&1 ; then
+ for inc_file in $included_files; do
+ echo $inc_file | grep -qs ^/
+ if [ $? -eq 0 ]; then
+ process_ld_so_conf "$root" "$root$inc_file"
+ else
+ process_ld_so_conf "$root" "$(pwd)/$inc_file"
+ fi
+ done
+ fi
continue
fi
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698