diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-13 16:24:59 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 11:04:55 +0000 |
| commit | f1cdf64cd5fa4271403286271ead511989ce15a1 (patch) | |
| tree | 4b02dc53e10770da9aca05fb6e166bf020a55e26 /morphlib/cachekeycomputer.py | |
| parent | 89c0777fa1c8918f8402b64484b16b6c715c441b (diff) | |
| download | morph-f1cdf64cd5fa4271403286271ead511989ce15a1.tar.gz | |
One 'arch' to rule them all
Define a specific set of 4 architectures that Morph supports, and only
expose that value to morphologies.
Since GNU triplets are very common we also expose a GNU triplet. Other
morphologies should work out their configuration based on MORPH_ARCH.
This commit also removes the morphlib.util.arch() function, which
detected the machine Morph is running on via 'uname -m'. Morph's
architecture names do not necessarily map to the output of 'uname -m'
so we should not rely on it anywhere.
Diffstat (limited to 'morphlib/cachekeycomputer.py')
| -rw-r--r-- | morphlib/cachekeycomputer.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 244257a0..6acf654b 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -27,7 +27,7 @@ class CacheKeyComputer(object): self._calculated = {} def _filterenv(self, env): - keys = ["LOGNAME", "TARGET", "TARGET_STAGE1", "TARGET_GCC_CONFIG", + keys = ["LOGNAME", "MORPH_ARCH", "TARGET", "TARGET_STAGE1", "USER", "USERNAME"] return dict([(k, env[k]) for k in keys]) @@ -79,7 +79,6 @@ class CacheKeyComputer(object): def _calculate(self, artifact): keys = { - 'arch': self._build_env.arch, 'env': self._filterenv(self._build_env.env), 'filename': artifact.source.filename, 'kids': [self.compute_key(x) for x in artifact.dependencies] |