diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 21:57:02 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 21:57:02 +0000 |
| commit | 38dbf76f98a4a90aeffb691297a4b3aea1596848 (patch) | |
| tree | 5162818903deacb1a078687c6e17da481572a47f /chrome/tools | |
| parent | dec7db0c7de01a80b3daca4333e469944accb1b8 (diff) | |
| download | chromium_src-38dbf76f98a4a90aeffb691297a4b3aea1596848.zip chromium_src-38dbf76f98a4a90aeffb691297a4b3aea1596848.tar.gz chromium_src-38dbf76f98a4a90aeffb691297a4b3aea1596848.tar.bz2 | |
Fix another instance of potentially dangling ":" in LD_LIBRARY_PATH.
This file is not packaged with Chrome, so not as likely to cause problems, but
cleaning it up for completeness.
BUG=54132
Review URL: http://codereview.chromium.org/3372010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/build/linux/chrome-wrapper | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/tools/build/linux/chrome-wrapper b/chrome/tools/build/linux/chrome-wrapper index 090891f..ba11872 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") |