diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:38:06 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 20:38:06 +0000 |
| commit | 21dde4e8f58137dcbb4d09df8bc4ca59c3040500 (patch) | |
| tree | efebcae8fd83b58c6e9553b2066cce2753965f16 /chrome/installer | |
| parent | 195b2ad9e9df2730dd22e6c5161a7bb7bbf99709 (diff) | |
| download | chromium_src-21dde4e8f58137dcbb4d09df8bc4ca59c3040500.zip chromium_src-21dde4e8f58137dcbb4d09df8bc4ca59c3040500.tar.gz chromium_src-21dde4e8f58137dcbb4d09df8bc4ca59c3040500.tar.bz2 | |
Find the 32-bit libs in the right place on 32-bit buildbot.
Review URL: http://codereview.chromium.org/42300
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/linux/debian/build.sh | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index d06226b..bd567f6 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -143,22 +143,27 @@ stage_install() { # https://bugs.launchpad.net/ubuntu/+source/ia32-libs/+bug/246911 grab_lib32() { echo "Copying 32-bit libs..." + if [ "$(uname -m)" = "x86_64" ]; then + LIBDIR="/usr/lib32" + else + LIBDIR="/usr/lib" + fi local SYSLIBS=" - /usr/lib32/libsqlite3.so.0 - /usr/lib32/libsqlite3.so.0.8.6 - /usr/lib32/libnspr4.so.0d - /usr/lib32/libplds4.so.0d - /usr/lib32/libplc4.so.0d - /usr/lib32/libssl3.so.1d - /usr/lib32/libnss3.so.1d - /usr/lib32/libsmime3.so.1d - /usr/lib32/libnssutil3.so.1d - /usr/lib32/nss/libfreebl3.so - /usr/lib32/nss/libsoftokn3.chk - /usr/lib32/nss/libsoftokn3.so - /usr/lib32/nss/libnssckbi.so - /usr/lib32/nss/libnssdbm3.so - /usr/lib32/nss/libfreebl3.chk + ${LIBDIR}/libsqlite3.so.0 + ${LIBDIR}/libsqlite3.so.0.8.6 + ${LIBDIR}/libnspr4.so.0d + ${LIBDIR}/libplds4.so.0d + ${LIBDIR}/libplc4.so.0d + ${LIBDIR}/libssl3.so.1d + ${LIBDIR}/libnss3.so.1d + ${LIBDIR}/libsmime3.so.1d + ${LIBDIR}/libnssutil3.so.1d + ${LIBDIR}/nss/libfreebl3.so + ${LIBDIR}/nss/libsoftokn3.chk + ${LIBDIR}/nss/libsoftokn3.so + ${LIBDIR}/nss/libnssckbi.so + ${LIBDIR}/nss/libnssdbm3.so + ${LIBDIR}/nss/libfreebl3.chk " for lib in $SYSLIBS; do if [ -h "$lib" ]; then |