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

Unified Diff: chrome/tools/build/linux/chrome-wrapper

Issue 3412004: The recent change for setting LD_LIBRARY_PATH doesn't actually work, as the... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/tools/build/linux/chrome-wrapper
===================================================================
--- chrome/tools/build/linux/chrome-wrapper (revision 59564)
+++ chrome/tools/build/linux/chrome-wrapper (working copy)
@@ -81,14 +81,8 @@
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")
uname -m | grep -qs x86_64
« 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