Chromium Code Reviews| 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,15 @@ |
| 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 |
| + echo "$included_files" | grep -qs ^/ |
| + if [ $? -eq 0 ]; then |
| + for inc_file in $root$included_files; do |
|
Lei Zhang
2014/02/13 10:53:54
Oh, we need to check and make sure $included_files
|
| + process_ld_so_conf "$root" "$inc_file" |
| done |
| + else |
| + for inc_file in $(pwd)/$included_files; do |
| + process_ld_so_conf "$root" "$inc_file" |
| + done |
| fi |
| continue |
| fi |