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

Side by Side Diff: build/linux/sysroot_ld_path.sh

Issue 12578028: Fix a missing redirect to /dev/null in build/linux/sysroot_ld_path.sh. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # Reads etc/ld.so.conf and/or etc/ld.so.conf.d/*.conf and returns the 6 # Reads etc/ld.so.conf and/or etc/ld.so.conf.d/*.conf and returns the
7 # appropriate linker flags. 7 # appropriate linker flags.
8 # 8 #
9 # sysroot_ld_path.sh /abspath/to/sysroot 9 # sysroot_ld_path.sh /abspath/to/sysroot
10 # 10 #
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 if [ $? -eq 0 ]; then 78 if [ $? -eq 0 ]; then
79 log_error_and_exit $1 contains whitespace. 79 log_error_and_exit $1 contains whitespace.
80 fi 80 fi
81 81
82 LD_SO_CONF="$1/etc/ld.so.conf" 82 LD_SO_CONF="$1/etc/ld.so.conf"
83 LD_SO_CONF_D="$1/etc/ld.so.conf.d" 83 LD_SO_CONF_D="$1/etc/ld.so.conf.d"
84 84
85 if [ -e "$LD_SO_CONF" ]; then 85 if [ -e "$LD_SO_CONF" ]; then
86 process_ld_so_conf "$1" "$LD_SO_CONF" | xargs echo 86 process_ld_so_conf "$1" "$LD_SO_CONF" | xargs echo
87 elif [ -e "$LD_SO_CONF_D" ]; then 87 elif [ -e "$LD_SO_CONF_D" ]; then
88 find "$LD_SO_CONF_D" -maxdepth 1 -name '*.conf' -print -quit 88 find "$LD_SO_CONF_D" -maxdepth 1 -name '*.conf' -print -quit > /dev/null
89 if [ $? -eq 0 ]; then 89 if [ $? -eq 0 ]; then
90 for entry in $LD_SO_CONF_D/*.conf; do 90 for entry in $LD_SO_CONF_D/*.conf; do
91 process_ld_so_conf "$1" "$entry" 91 process_ld_so_conf "$1" "$entry"
92 done | xargs echo 92 done | xargs echo
93 fi 93 fi
94 fi 94 fi
OLDNEW
« 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