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

Unified Diff: build/linux/sysroot_ld_path.sh

Issue 163103003: Fix sysroot_ld_path.sh to correctly process the included configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 10 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
===================================================================
--- build/linux/sysroot_ld_path.sh (revision 250969)
+++ build/linux/sysroot_ld_path.sh (working copy)
@@ -46,15 +46,19 @@
echo "$ENTRY" | grep -qs ^include
if [ $? -eq 0 ]; then
local included_files=$(echo "$ENTRY" | sed 's/^include //')
- 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
+ echo "$included_files" | grep -qs ^/
+ if [ $? -eq 0 ]; then
+ if ls $root$included_files >/dev/null 2>&1 ; then
+ for inc_file in $root$included_files; do
+ process_ld_so_conf "$root" "$inc_file"
+ done
+ fi
+ else
+ if ls $(pwd)/$included_files >/dev/null 2>&1 ; then
+ for inc_file in $(pwd)/$included_files; do
+ process_ld_so_conf "$root" "$inc_file"
+ done
+ fi
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