Fix iOS plat check and add default toolchain config

DragonBuild · Jan 13, 2024 · be26ca4 · be26ca4
1 parent 1e96f9c
commit be26ca4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/dragongen/generation.py b/src/dragongen/generation.py
@@ -193,11 +193,18 @@ def generate_vars(self, module_variables: dict, target: str) -> dict:
         # Specify toolchain paths
         use_objcs = 'objcs' in project_dict
 
-        if platform.platform().startswith('macOS'):
-            toolchain = Toolchain.locate_macos_toolchain(use_objcs)
+        sys = platform.system()
+        if sys == 'Darwin':
+            plat = platform.platform()
+            if 'iP' in plat:
+                toolchain = Toolchain()
+            else:
+                toolchain = Toolchain.locate_macos_toolchain(use_objcs)
         # elif WINDOWS IS NOT A REAL OPERATING SYSTEM ::::)
-        else:
+        elif sys == 'Linux':
             toolchain = Toolchain.locate_linux_toolchain(use_objcs)
+        else:
+            toolchain = Toolchain()
 
         if toolchain is None:
             dberror("Dragon Gen", "Could not locate any usable toolchain or even determine the existence of clang.")
@@ -552,6 +559,7 @@ def handle(ex: Exception):
         else:
             dberror("Dragon Gen", "Exiting...")
     except Exception:
+        dberror("Dragon Gen", f'tty/termios unavailable: {ex}')
         dberror("Dragon Gen", "Exiting...")
 
     print('export DRAGONGEN_FAILURE=1')

diff --git a/src/dragongen/toolchain.py b/src/dragongen/toolchain.py
@@ -3,14 +3,15 @@
 
 class Toolchain:
     def __init__(self):
-        self.ass = ""
-        self.clang = ""
-        self.clangpp = ""
-        self.ld = ""
-        self.codesign = ""
-        self.dsym = ""
-        self.lipo = ""
-        self.tapi = ""
+        self.clang = "clang"
+        self.clangpp = "clang++"
+        self.ass = self.clang
+        self.ld = self.clang
+        self.codesign = "ldid"
+        self.dsym = "dsymutil"
+        self.plutil = "plutil"
+        self.lipo = "lipo"
+        self.tapi = "tapi"
 
     @classmethod
     def locate_macos_toolchain(cls, use_objcs: bool):
@@ -35,7 +36,6 @@ def locate_macos_toolchain(cls, use_objcs: bool):
         tc.clangpp = tc_dir + 'clang++'
         tc.ass = tc.clang
         tc.ld = tc.clang
-        tc.codesign = 'ldid'
         tc.dsym = tc_dir + 'dsymutil'
         # FIXME: hardcoded while I wait on a real distribution of llvm-objcs
         if use_objcs: