chrome/tools/build/linux/chrome-wrapper - Issue 3457004: Merge 59579 - The recent change for setting LD_LIBRARY_PATH doesn't actually ...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3457004: Merge 59579 - The recent change for setting LD_LIBRARY_PATH doesn't actually ... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/517/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

Index: chrome/tools/build/linux/chrome-wrapper

===================================================================

--- chrome/tools/build/linux/chrome-wrapper (revision 59596)

+++ chrome/tools/build/linux/chrome-wrapper (working copy)

@@ -81,7 +81,7 @@

esac

# Always use our ffmpeg and other shared libs.

-export LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$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")

« no previous file with comments | « no previous file | no next file » | no next file with comments »