diff options
| author | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 00:11:27 +0000 |
|---|---|---|
| committer | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 00:11:27 +0000 |
| commit | f3b3ba7bc2f675606d5def3a0982b3988e529b13 (patch) | |
| tree | 7d1af50ed41351d3bb50316af1f5cc51f612645d /build/install-build-deps.sh | |
| parent | f5d791b327af4d5d7d04b1e74ad2d0318171aa91 (diff) | |
| download | chromium_src-f3b3ba7bc2f675606d5def3a0982b3988e529b13.zip chromium_src-f3b3ba7bc2f675606d5def3a0982b3988e529b13.tar.gz chromium_src-f3b3ba7bc2f675606d5def3a0982b3988e529b13.tar.bz2 | |
Fixed a bug that was introduced when we started deprecating 32bit libraries on 64bit systems.
This needs a little bit of explanation. Normally, we would want to restructure
the code to have separate variables for "--lib32" and for the result of the
"yes_no" question. But that requires more global changes.
Instead, in this case, we want to very clearly document that we added an
early "if" statement to break out. And this is intended to be a temporary
measure until the entire feature is fully removed.
So, I instead opted for resetting the "do_inst_lib32" variable -- and a lengthy
comment explaining this decision.
BUG=233047
TEST=run with --lib32 and verify that entering "N" aborts the installation.
Review URL: https://chromiumcodereview.appspot.com/14166013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-build-deps.sh')
| -rwxr-xr-x | build/install-build-deps.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 757c545..382fc11 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -297,6 +297,21 @@ if [ "$(uname -m)" = "x86_64" ]; then echo echo "Installation complete." exit 0 + else + # This conditional statement has been added to deprecate and eventually + # remove support for 32bit libraries on 64bit systems. But for the time + # being, we still have to support a few legacy systems (e.g. bots), where + # this feature is needed. + # We only even give the user the option to install these libraries, if + # they explicitly requested doing so by setting the --lib32 command line + # flag. + # And even then, we interactively ask them one more time whether they are + # absolutely sure. + # In order for that to work, we must reset the ${do_inst_lib32} variable. + # There are other ways to achieve the same goal. But resetting the + # variable is the best way to document the intended behavior -- and to + # allow us to gradually deprecate and then remove the obsolete code. + do_inst_lib32= fi echo "WARNING" |