diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-10 12:18:38 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-10 12:19:29 +0100 |
| commit | be6870d1145634401f912e7f5623da27b20180cd (patch) | |
| tree | 801b4afcbd39c8c4e22e9d54ba0e9f6c29c44d50 /morphlib/plugins | |
| parent | 623e77cf0a9e3b018195490870e3a2e1f003d31d (diff) | |
| parent | 29c836174baff2b6fa02d8ce7109ff656c4d4834 (diff) | |
| download | morph-be6870d1145634401f912e7f5623da27b20180cd.tar.gz | |
Merge branch 'sam/remote-artifact-cache-failure'
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py index ec0cfbcb..bfd0d047 100644 --- a/morphlib/plugins/cross-bootstrap_plugin.py +++ b/morphlib/plugins/cross-bootstrap_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -299,18 +299,8 @@ class CrossBootstrapPlugin(cliapp.Plugin): 'Nothing to cross-compile. Only chunks built in \'bootstrap\' ' 'mode can be cross-compiled.') - # FIXME: merge with build-command's code for i, a in enumerate(cross_chunks): - if build_command.is_built(a): - self.app.status(msg='The %(kind)s %(name)s is already built', - kind=a.source.morphology['kind'], - name=a.name) - build_command.cache_artifacts_locally([a]) - else: - self.app.status(msg='Cross-building %(kind)s %(name)s', - kind=a.source.morphology['kind'], - name=a.name) - build_command.build_artifact(a, build_env) + build_command.cache_or_build_artifact(a, build_env) for i, a in enumerate(native_chunks): build_command.get_sources(a) |