diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 21:00:14 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 21:00:14 +0000 |
| commit | f16aabfd9799a5c2bc684978cff1b4919b215b5b (patch) | |
| tree | dde6621b446430bb695734bc5a8619492eac7f8a /build/install-build-deps.sh | |
| parent | 1a380bae9cfcba2dc2ea6af640cab953f7aaebf6 (diff) | |
| download | chromium_src-f16aabfd9799a5c2bc684978cff1b4919b215b5b.zip chromium_src-f16aabfd9799a5c2bc684978cff1b4919b215b5b.tar.gz chromium_src-f16aabfd9799a5c2bc684978cff1b4919b215b5b.tar.bz2 | |
Only install the 32-bit compat packages on 64-bit.
This prevents the script from failing on 32-bit Ubuntu where the 32-bit
compat packages don't exist.
BUG=138234
Review URL: https://chromiumcodereview.appspot.com/10825369
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151745 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-build-deps.sh')
| -rwxr-xr-x | build/install-build-deps.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 2033ba5..705d4c2 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -67,9 +67,15 @@ dev_list="apache2.2-bin bison curl elfutils fakeroot flex g++ gperf perl php5-cgi pkg-config python python-cherrypy3 python-dev python-psutil rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff git-core - libc6-i386 lib32gcc1 $chromeos_dev_list" +# 64-bit systems need a minimum set of 32-bit compat packages for the pre-built +# NaCL binaries. These are always needed, regardless of whether or not we want +# the full 32-bit "cross-compile" support (--lib32). +if [ "$(uname -m)" = "x86_64" ]; then + dev_list="${dev_list} libc6-i386 lib32gcc1" +fi + # Run-time libraries required by chromeos only chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev" |