Split gccname from qemuname

This will allow things like building sparc32 using a sparc64 toolchain.

Signed-off-by: Andy Lutomirski <luto@kernel.org>

2 files changed, 7 insertions, 2 deletions

diff --git a/virtme/architectures.py b/virtme/architectures.py
index a5e9389..4131441 100644
--- a/virtme/architectures.py
+++ b/virtme/architectures.py
@@ -11,6 +11,7 @@ class Arch(object):
     def __init__(self, name):
         self.qemuname = name
         self.linuxname = name
+        self.gccname = name
 
     defconfig_target = 'defconfig'
 
@@ -150,6 +151,7 @@ class Arch_aarch64(Arch):
 
         self.qemuname = 'aarch64'
         self.linuxname = 'arm64'
+        self.gccname = 'aarch64'
 
     @staticmethod
     def qemuargs(is_native):
@@ -186,6 +188,7 @@ class Arch_ppc64(Arch):
         self.defconfig_target = 'ppc64_defconfig'
         self.qemuname = 'ppc64'
         self.linuxname = 'powerpc'
+        self.gccname = 'ppc64'
 
     def qemuargs(self, is_native):
         ret = Arch.qemuargs(is_native)
@@ -205,6 +208,7 @@ class Arch_sparc64(Arch):
         self.defconfig_target = 'sparc64_defconfig'
         self.qemuname = 'sparc64'
         self.linuxname = 'sparc'
+        self.gccname = 'sparc64'
 
     def qemuargs(self, is_native):
         ret = Arch.qemuargs(is_native)
@@ -224,6 +228,7 @@ class Arch_s390x(Arch):
 
         self.qemuname = 's390x'
         self.linuxname = 's390'
+        self.gccname = 's390x'
 
     @staticmethod
     def virtio_dev_type(virtiotype):
diff --git a/virtme/commands/configkernel.py b/virtme/commands/configkernel.py
index ef10c87..4c35efb 100644
--- a/virtme/commands/configkernel.py
+++ b/virtme/commands/configkernel.py
@@ -99,8 +99,8 @@ def main():
     elif args.arch == 'i386':
         conf.append('CONFIG_64BIT=n')
 
-    if shutil.which('%s-linux-gnu-gcc' % arch.qemuname):
-        conf.append('CONFIG_CROSS_COMPILE="%s-linux-gnu-"' % arch.qemuname)
+    if shutil.which('%s-linux-gnu-gcc' % arch.gccname):
+        conf.append('CONFIG_CROSS_COMPILE="%s-linux-gnu-"' % arch.gccname)
 
     if args.allnoconfig and args.defconfig:
         arg_fail('allnoconfig and defconfig are incompatible')