diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 19:31:52 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 19:31:52 +0000 |
| commit | 4a242bea68ddd58cfdfc318d736dabaf765319aa (patch) | |
| tree | a8aa183e51e0bf649506fbea15b4854e9e9f2cc9 /build/install-build-deps.sh | |
| parent | 0d3329e2eb4c7f794484f2aeec1c63e182eae391 (diff) | |
| download | chromium_src-4a242bea68ddd58cfdfc318d736dabaf765319aa.zip chromium_src-4a242bea68ddd58cfdfc318d736dabaf765319aa.tar.gz chromium_src-4a242bea68ddd58cfdfc318d736dabaf765319aa.tar.bz2 | |
Improve warnings about 32bit libs on 64bit systems.
Review URL: https://codereview.chromium.org/11360130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-build-deps.sh')
| -rwxr-xr-x | build/install-build-deps.sh | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 427e888..4b5a616 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -225,27 +225,33 @@ fi # Install 32bit backwards compatibility support for 64bit systems if [ "$(uname -m)" = "x86_64" ]; then - if test "$do_inst_lib32" = "" - then - echo "We no longer recommend that you use this script to install" - echo "32bit libraries on a 64bit system. Instead, consider using" - echo "the install-chroot.sh script to help you set up a 32bit" - echo "environment for building and testing 32bit versions of Chrome." - echo - echo "If you nonetheless want to try installing 32bit libraries" - echo "directly, you can do so by explicitly passing the --lib32" - echo "option to install-build-deps.sh." - fi if test "$do_inst_lib32" != "1" then - echo "Exiting without installing any 32bit libraries." + echo "NOTE: If you were expecting the option to install 32bit libs," + echo "please run with the --lib32 flag." + echo + echo "Installation complete." exit 0 fi - echo "N.B. the code for installing 32bit libraries on a 64bit" - echo " system is no longer actively maintained and might" - echo " not work with modern versions of Ubuntu or Debian." + echo "WARNING" + echo + echo "We no longer recommend that you use this script to install" + echo "32bit libraries on a 64bit system. Instead, consider using the" + echo "install-chroot.sh script to help you set up a 32bit environment" + echo "for building and testing 32bit versions of Chrome." + echo + echo "The code for installing 32bit libraries on a 64bit system is" + echo "unmaintained and might not work with modern versions of Ubuntu" + echo "or Debian." echo + echo -n "Are you sure you want to proceed (y/N) " + if yes_no 1; then + do_inst_lib32=1 + fi + if test "$do_inst_lib32" != "1" + exit 0 + fi # Standard 32bit compatibility libraries echo "First, installing the limited existing 32-bit support..." |