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

Unified Diff: build/install-build-deps.sh

Issue 11360130: Improve warnings about 32bit libs on 64bit systems. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/install-build-deps.sh
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 427e888d3aaec678f76214c91d8b20e867725f5f..4b5a6163459463a2977adf878336dd859a80202c 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"
tapted 2012/11/07 22:24:29 missing `; then` ?
Michael Moss 2012/11/07 22:57:10 Ugh, thanks. https://codereview.chromium.org/11360
+ exit 0
+ fi
# Standard 32bit compatibility libraries
echo "First, installing the limited existing 32-bit support..."
« 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