diff options
| author | Yunlian Jiang <yunlian@google.com> | 2015-06-11 14:28:12 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-16 04:26:12 +0000 |
| commit | 0aad8ad5e9f02736ee598fad7ecd7358750eeb37 (patch) | |
| tree | 59023d04011ae11407df0cc5a9d2db06751196fa /scripts | |
| parent | 9907432a0e4e2f0f1300bfe739c330dcb7d78447 (diff) | |
| download | chromite-0aad8ad5e9f02736ee598fad7ecd7358750eeb37.tar.gz | |
filter out -clang-syntax from binhost.
We will add '-clang-syntax' on falco board to make it clang-clean.
However, binaries are shared amongst multiple boards on a canary builder.
On the slippy-canary-group, falco will try to use slippy's binaries,
but cros_generate_local_binhosts will refuse it because of the CFLAGS
difference. To avoid the error in the BUG entry, we need to filter out
'-clang-syntax' now.
BUG=chromium:499115
TEST=~/trunk/chromite/bin/cros_generate_local_binhosts --board=falco
generate same results w/out CFLAGS=$CFLAGS -clang-syntax
in the make.conf of falco.
~/trunk/chromite/cbuildbot/binhost_test
generate same results w/out CFLAGS=$CFLAGS -clang-syntax in
the make.conf of falco.
Change-Id: Idcb519654b669b81feaa24cfa6ff3da5ddab8a67
Reviewed-on: https://chromium-review.googlesource.com/277081
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cros_generate_local_binhosts.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/cros_generate_local_binhosts.py b/scripts/cros_generate_local_binhosts.py index c85995a59..3bed5d20f 100644 --- a/scripts/cros_generate_local_binhosts.py +++ b/scripts/cros_generate_local_binhosts.py @@ -30,8 +30,13 @@ def FindCandidateBoards(): def SummarizeCompatibility(board): """Returns a string that will be the same for compatible boards.""" cmd = ["portageq-%s" % board, "envvar", "ARCH", "CFLAGS"] - return cros_build_lib.RunCommand(cmd, redirect_stdout=True, - print_cmd=False).output.rstrip() + summary = cros_build_lib.RunCommand(cmd, redirect_stdout=True, + print_cmd=False).output.rstrip() + # We will add -clang-syntax to falco and nyan board. So we need to + # filter out -clang-syntax to make the flags from PFQ are the same as + # the release-board. See crbug.com/499115 + # TODO(yunlian): Remove this when all the boards are build with -clang-syntax + return summary.replace(" -clang-syntax", "") def GenerateBinhostLine(build_root, compatible_boards): |