diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-11-21 23:57:44 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2023-04-10 15:48:49 -0400 |
| commit | f3b1647b1e49472803e4dac9f01941f5c9b907db (patch) | |
| tree | 3f52673d254c05a960def3f80adfa8fd099733aa | |
| parent | targets: Fix CHOST vs `uname -m` confusion (diff) | |
| download | catalyst-wip/mattst88.tar.gz catalyst-wip/mattst88.tar.bz2 catalyst-wip/mattst88.zip | |
catalyst: WIPwip/mattst88
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 732c5939..35aa82ba 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -108,13 +108,11 @@ class StageBase(TargetBase, ClearBase, GenBase): host = self.settings["chost"].split("-")[0] else: host = self.settings["subarch"] - self.settings["hostarch"] = host if "cbuild" in self.settings: build = self.settings["cbuild"].split("-")[0] else: build = platform.machine() - self.settings["buildarch"] = build arch_dir = normpath(self.settings['sharedir'] + '/arch/') @@ -139,6 +137,9 @@ class StageBase(TargetBase, ClearBase, GenBase): else: raise CatalystError("Unknown host machine type " + host) + self.settings["hostarch"] = arch + self.settings["buildarch"] = build + if setarch.get('if_build', '') == platform.machine(): chroot = f'setarch {setarch["arch"]} chroot' else: |