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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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) 2010 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2010 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 *:$HERE:*) 74 *:$HERE:*)
75 # $PATH already contains $HERE, leave it where it is. 75 # $PATH already contains $HERE, leave it where it is.
76 ;; 76 ;;
77 *) 77 *)
78 # Prepend $HERE to $PATH. 78 # Prepend $HERE to $PATH.
79 export PATH="$HERE:$PATH" 79 export PATH="$HERE:$PATH"
80 ;; 80 ;;
81 esac 81 esac
82 82
83 # Always use our ffmpeg and other shared libs. 83 # Always use our ffmpeg and other shared libs.
84 if [[ -n "$LD_LIBRARY_PATH" ]]; then 84 export LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target${LD_LIBRARY_PATH:+:${LD _LIBRARY_PATH}}"
85 LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$LD_LIBRARY_PATH"
86 else
87 LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target"
88 fi
89 export LD_LIBRARY_PATH
90
91 85
92 MISSING_LIBS=$(ldd "$HERE/chrome" 2> /dev/null |grep "not found$" | cut -d" " -f 1|sed 's/\t//') 86 MISSING_LIBS=$(ldd "$HERE/chrome" 2> /dev/null |grep "not found$" | cut -d" " -f 1|sed 's/\t//')
93 CHROME_ARCH=$(check_executable "$HERE/chrome") 87 CHROME_ARCH=$(check_executable "$HERE/chrome")
94 uname -m | grep -qs x86_64 88 uname -m | grep -qs x86_64
95 if [ $? = 1 ]; then 89 if [ $? = 1 ]; then
96 LIBDIRS="/lib /lib32 /usr/lib /usr/lib32" 90 LIBDIRS="/lib /lib32 /usr/lib /usr/lib32"
97 else 91 else
98 LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib" 92 LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib"
99 fi 93 fi
100 94
(...skipping 29 matching lines...) Expand all
130 fi 124 fi
131 done 125 done
132 126
133 # Custom version string for this release. This can be used to add a downstream 127 # Custom version string for this release. This can be used to add a downstream
134 # vendor string or release channel information. 128 # vendor string or release channel information.
135 export CHROME_VERSION_EXTRA="custom" 129 export CHROME_VERSION_EXTRA="custom"
136 130
137 exists_desktop_file || generate_desktop_file 131 exists_desktop_file || generate_desktop_file
138 132
139 exec "$HERE/chrome" "$@" 133 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