diff options
| author | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 23:35:19 +0000 |
|---|---|---|
| committer | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 23:35:19 +0000 |
| commit | 534ea0a5f1f2123b13a1c3bd32fcbf028d549765 (patch) | |
| tree | 828d4662cbaae6a99f95ecda3e32e05293c0f1ef /chrome/tools/build | |
| parent | d55131723647d0a33eed5e66f6d75c55cfb406a9 (diff) | |
| download | chromium_src-534ea0a5f1f2123b13a1c3bd32fcbf028d549765.zip chromium_src-534ea0a5f1f2123b13a1c3bd32fcbf028d549765.tar.gz chromium_src-534ea0a5f1f2123b13a1c3bd32fcbf028d549765.tar.bz2 | |
The recent change for setting LD_LIBRARY_PATH doesn't actually work, as the
script is executed by /bin/sh. On many systems, /bin/sh does not have support
for "[[". We could either switch to a different shell (e.g. /bin/bash), we
could switch to using "[" instead, or we could avoid the entire problem by
using "${:+}" variable expansion.
I tested that the latter does the right thing with /bin/bash, /bin/ash,
/bin/dash, /bin/zsh, /bin/sh (the latter being a symbolic link to /bin/dash).
So, I think we are on the safe side.
BUG=54132
TEST=Start Chrome and notice that there no longer is an error message about "[[" being unavailable
Review URL: http://codereview.chromium.org/3412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools/build')
| -rwxr-xr-x | chrome/tools/build/linux/chrome-wrapper | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/tools/build/linux/chrome-wrapper b/chrome/tools/build/linux/chrome-wrapper index ba11872..a04292f 100755 --- a/chrome/tools/build/linux/chrome-wrapper +++ b/chrome/tools/build/linux/chrome-wrapper @@ -81,13 +81,7 @@ case ":$PATH:" in esac # Always use our ffmpeg and other shared libs. -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 - +export LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target${LD_LIBRARY_PATH:+:${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") |