Bug 259945 - Mozilla should not use LD_LIBRARY_PATH on solaris; use libxul.so instead of libgkgfx.so; r=wtc sr=neil

This commit is contained in:
Boying Lu 2008-12-05 07:30:37 +01:00
Родитель 0dd49dcebe
Коммит 140c6c1955
1 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -340,18 +340,18 @@ fi
## ##
## When a shared library is a symbolic link, $ORIGIN will be replaced with ## When a shared library is a symbolic link, $ORIGIN will be replaced with
## the real path (i.e., what the symbolic link points to) by the runtime ## the real path (i.e., what the symbolic link points to) by the runtime
## linker. For example, if dist/bin/libgkgfx.so is a symbolic link to ## linker. For example, if dist/bin/libxul.so is a symbolic link to
## gfx/src/libgkgfx.so, $ORIGIN will be "gfx/src" instead of "dist/bin". ## toolkit/library/libxul.so, $ORIGIN will be "toolkit/library" instead of "dist/bin".
## So the runtime linker will use "gfx/src" NOT "dist/bin" to locate the ## So the runtime linker will use "toolkit/library" NOT "dist/bin" to locate the
## other shared libraries that libgkgfx.so depends on. This only happens ## other shared libraries that libxul.so depends on. This only happens
## when a user (developer) tries to start firefox, thunderbird, or seamonkey ## when a user (developer) tries to start firefox, thunderbird, or seamonkey
## under dist/bin. To solve the problem, we should rely on LD_LIBRARY_PATH ## under dist/bin. To solve the problem, we should rely on LD_LIBRARY_PATH
## to locate shared libraries. ## to locate shared libraries.
## ##
## Note: ## Note:
## We choose libgkgfx.so as a representative shared library. If it is ## We choose libxul.so as a representative shared library. If it is
## a symbolic link, all other shared libraries are symbolic links also. ## a symbolic link, all other shared libraries are symbolic links also.
if [ `uname -s` != "SunOS" -o -h "$MOZ_DIST_BIN/libgkgfx.so" ] if [ `uname -s` != "SunOS" -o -h "$MOZ_DIST_BIN/libxul.so" ]
then then
LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
fi fi