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

Side by Side Diff: chrome/tools/build/linux/chrome-wrapper

Issue 340060: Add lib.target to chrome-wrapper's LD_LIBRARY_PATH. (Closed)
Patch Set: scons still uses lib dir ... keep it around Created 11 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 2
3 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Running Chromium via this script makes it possible to set Chromium as the 7 # Running Chromium via this script makes it possible to set Chromium as the
8 # default browser directly out of a compile, without needing to package it. 8 # default browser directly out of a compile, without needing to package it.
9 9
10 DESKTOP="chromium-devel" 10 DESKTOP="chromium-devel"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 *:$HERE:*) 53 *:$HERE:*)
54 # $PATH already contains $HERE 54 # $PATH already contains $HERE
55 ;; 55 ;;
56 *) 56 *)
57 # Append $HERE to $PATH 57 # Append $HERE to $PATH
58 export PATH="$PATH:$HERE" 58 export PATH="$PATH:$HERE"
59 ;; 59 ;;
60 esac 60 esac
61 61
62 # Always use our ffmpeg and other shared libs. 62 # Always use our ffmpeg and other shared libs.
63 export LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" 63 export LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$LD_LIBRARY_PATH"
64 64
65 exists_desktop_file || generate_desktop_file 65 exists_desktop_file || generate_desktop_file
66 66
67 exec "$HERE/chrome" "$@" 67 exec "$HERE/chrome" "$@"
OLDNEW
« 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