diff options
| author | Yunlian Jiang <yunlian@google.com> | 2014-05-20 13:16:29 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-05-21 20:35:24 +0000 |
| commit | a42491359d23e148621ec857c19887554c81f520 (patch) | |
| tree | 1b4b7a7a969366abdebffca38300a79832b798fa /buildbot | |
| parent | 6ef898bdf40384100b5f3a4899b2de0382409c11 (diff) | |
| download | chromite-a42491359d23e148621ec857c19887554c81f520.tar.gz | |
Set some of USE flags to BuildPackageStage only.
The USE flags in config are for target only and should not
be used to build host packages. This fixes this issue.
BUG=chromium:375339
TEST=cbuildbot x86-generic-asan, amd64-generic-asan,
x86-generic-tot-asan-informational,
amd64-generic-tot-asan-informational
Change-Id: Ie53f443c4b6a2eaa7f2f1a058369a4f1da1bf7eb
Reviewed-on: https://chromium-review.googlesource.com/200642
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Diffstat (limited to 'buildbot')
| -rw-r--r-- | buildbot/stages/build_stages.py | 6 | ||||
| -rw-r--r-- | buildbot/stages/generic_stages.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/buildbot/stages/build_stages.py b/buildbot/stages/build_stages.py index f9455d24b..bc3d376ba 100644 --- a/buildbot/stages/build_stages.py +++ b/buildbot/stages/build_stages.py @@ -212,6 +212,12 @@ class BuildPackagesStage(generic_stages.BoardSpecificBuilderStage, self.name += ' [%s]' % constants.USE_PGO_USE useflags.append(constants.USE_PGO_USE) + if useflags: + if 'USE' in self._portage_extra_env: + self._portage_extra_env['USE'] += ' ' + ' '.join(useflags) + else: + self._portage_extra_env['USE'] = ' '.join(useflags) + def _GetArchitectures(self): """Get the list of architectures built by this builder.""" return set(self._GetPortageEnvVar('ARCH', b) for b in self._boards) diff --git a/buildbot/stages/generic_stages.py b/buildbot/stages/generic_stages.py index fe2ff703d..365743cc1 100644 --- a/buildbot/stages/generic_stages.py +++ b/buildbot/stages/generic_stages.py @@ -109,7 +109,7 @@ class BuilderStage(object): # USE and enviroment variable settings. self._portage_extra_env = {} - useflags = self._run.config.useflags[:] + useflags = [] if self._run.options.clobber: self._portage_extra_env['IGNORE_PREFLIGHT_BINHOST'] = '1' |