compiler_archs: gcc: Use main 'gcc' if is same arch

Author: shaymargolis

shellblocks/compiler_archs/__init__.py

@@ -1,3 +1,4 @@
+from subprocess import check_output, CalledProcessError
 from enum import Enum
 from shellblocks.compiler_archs.mips import CompilerArchMIPSBE, CompilerArchMIPSLE
 from shellblocks.compiler_archs.arm import CompilerArchARMLE
@@ -14,17 +15,42 @@ class CompilerArchOption(Enum):
     X86_64 = "x86_64"
 
 
+def get_current_platform():
+    try:
+        machine_bytes = check_output(["gcc", "-dumpmachine"])
+    except FileNotFoundError:
+        return None
+    except CalledProcessError:
+        return None
+
+    machine = machine_bytes.decode()
+
+    if "mips-" in machine:
+        return CompilerArchOption.MIPSBE
+    if "mipsel-" in machine:
+        return CompilerArchOption.MIPSLE
+    if "arm-" in machine:
+        return CompilerArchOption.ARMLE
+    if "x86_64-" in machine:
+        return CompilerArchOption.X86_64
+
+    return None
+
+
 def compiler_arch_to_object(arch: CompilerArchOption) -> CompilerArch:
+    current_platform = get_current_platform()
+    use_main_gcc = (current_platform == arch)
+
     if arch == CompilerArchOption.MIPSBE:
-        return CompilerArchMIPSBE()
+        return CompilerArchMIPSBE(use_main_gcc)
     elif arch == CompilerArchOption.MIPSLE:
-        return CompilerArchMIPSLE()
+        return CompilerArchMIPSLE(use_main_gcc)
     elif arch == CompilerArchOption.ARMLE:
-        return CompilerArchARMLE()
+        return CompilerArchARMLE(use_main_gcc)
     elif arch == CompilerArchOption.X86:
-        return CompilerArchX86()
+        return CompilerArchX86(CompilerArchOption.X86_64 == current_platform)
     elif arch == CompilerArchOption.X86_64:
-        return CompilerArchX86_64()
+        return CompilerArchX86_64(use_main_gcc)
 
     raise NotImplementedError()
 

shellblocks/compiler_archs/arm.py

@@ -5,8 +5,8 @@
 
 
 class CompilerArchARM(CompilerArchGCC):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, use_main_gcc: bool):
+        super().__init__(use_main_gcc)
 
     def get_headers(self) -> List[str]:
         return ["arch/arm/utils.h"]

shellblocks/compiler_archs/gcc.py

@@ -2,10 +2,15 @@
 
 
 class CompilerArchGCC(CompilerArch):
-    def __init__(self):
+    def __init__(self, use_main_gcc: bool):
         super().__init__()
 
-        self.compiler_path = self.get_compiler_path()
+        self.use_main_gcc = use_main_gcc
+
+        if self.use_main_gcc:
+            self.compiler_path = "gcc"
+        else:
+            self.compiler_path = self.get_compiler_path()
 
     def get_compiler_path(self):
         raise NotImplementedError()

shellblocks/compiler_archs/mips.py

@@ -5,8 +5,8 @@
 
 
 class CompilerArchMIPS(CompilerArchGCC):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, use_main_gcc: bool):
+        super().__init__(use_main_gcc)
 
     def get_gcc_flags(self):
         return super().get_gcc_flags() + [

shellblocks/compiler_archs/x86.py

@@ -2,8 +2,8 @@
 
 
 class CompilerArchX86(CompilerArchX86_64):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, use_main_gcc: bool):
+        super().__init__(use_main_gcc)
 
     def get_gcc_flags(self):
         return super().get_gcc_flags() + [

shellblocks/compiler_archs/x86_64.py

@@ -5,8 +5,8 @@
 
 
 class CompilerArchX86_64(CompilerArchGCC):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, use_main_gcc: bool):
+        super().__init__(use_main_gcc)
 
     def get_headers(self) -> List[str]:
         return ["arch/x86/utils.h"]