| Index: chrome/tools/build/linux/chrome-wrapper
|
| diff --git a/chrome/tools/build/linux/chrome-wrapper b/chrome/tools/build/linux/chrome-wrapper
|
| index 090891fad6fcedc97f38c31853e2a8953e38d378..ba1187233edddfc241dd1f93ac20b38ecbdf5a17 100755
|
| --- a/chrome/tools/build/linux/chrome-wrapper
|
| +++ b/chrome/tools/build/linux/chrome-wrapper
|
| @@ -81,7 +81,13 @@ case ":$PATH:" in
|
| esac
|
|
|
| # Always use our ffmpeg and other shared libs.
|
| -export LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$LD_LIBRARY_PATH"
|
| +if [[ -n "$LD_LIBRARY_PATH" ]]; then
|
| + LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$LD_LIBRARY_PATH"
|
| +else
|
| + LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target"
|
| +fi
|
| +export LD_LIBRARY_PATH
|
| +
|
|
|
| MISSING_LIBS=$(ldd "$HERE/chrome" 2> /dev/null |grep "not found$" | cut -d" " -f 1|sed 's/\t//')
|
| CHROME_ARCH=$(check_executable "$HERE/chrome")
|
|
|