commit df8053336feea245a6bb43fe16dbc16a7b3d71cd
author cmtice <cmtice@google.com> Tue May 20 13:31:03 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed May 21 04:07:32 2014 +0000
tree 131f5d49e85a75cfee63993d3a347da32b93a2c1
parent 42709763f709b0e08d4ed041e4374cb9dd5d6570

Add --skip_chroot_upgrade flag to build_packages.

This CL adds the '--skip_chroot_upgrade' flag to all calls to
build_packages that clobber CFLAGS, LDFLAGS, etc.  This is to
prevent the call to build_packages from deciding to try to rebuild
the compiler itself (which is not the right place to do that).

BUG=None
TEST=Tested adding flag by hand to call to build_packages that used to
fail; it passed with the flag.

Change-Id: Ia0152f76f8a25cf0488a4a72c4add7e4b3182feb
Reviewed-on: https://chrome-internal-review.googlesource.com/164050
Reviewed-by: Han Shen <shenhan@google.com>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>

build_chromeos.py

diff --git a/build_chromeos.py b/build_chromeos.py
index 637e3a2..6968989 100755
--- a/build_chromeos.py
+++ b/build_chromeos.py
@@ -165,7 +165,7 @@
       "LDFLAGS=\"$(portageq-%s envvar LDFLAGS) %s\" "
       "CHROME_ORIGIN=SERVER_SOURCE "
       "%s "
-      "%s "
+      "%s --skip_chroot_upgrade"
       "chromeos-chrome"
       % (options.board, options.cflags,
          options.board, options.cxxflags,
@@ -191,7 +191,7 @@
       "LDFLAGS=\"$(portageq-%s envvar LDFLAGS) %s\" "
       "CHROME_ORIGIN=SERVER_SOURCE BUILDTYPE=Debug "
       "%s "
-      "%s "
+      "%s --skip_chroot_upgrade"
       "chromeos-chrome"
       % (options.board, options.cflags,
          options.board, options.cxxflags,
@@ -218,7 +218,7 @@
       "LDFLAGS=\"$(portageq-%s envvar LDFLAGS) %s\" "
       "CHROME_ORIGIN=SERVER_SOURCE "
       "%s "
-      "%s"
+      "%s --skip_chroot_upgrade"
       % (options.board, options.cflags,
          options.board, options.cxxflags,
          options.board, options.ldflags,