[lldb] The os and version are not separate components in the triple

[JDevlieghere]

Summary

Create a valid triple in the Darwin builder. Currently it was
incorrectly treating the os and version as two separate components in
the triple.

[aprantl]

Yup that's wrong. Personally I would only append env to the list if non-empty. Thanks!

[JDevlieghere]

Skip the environment if it's empty and avoid a TypeError when concatenating 'NoneType' and 'str'.

[aprantl]

thanks!

lldb/packages/Python/lldbsuite/test/builders/darwin.py

62

So this tests for the empty string?

[JDevlieghere]

lldb/packages/Python/lldbsuite/test/builders/darwin.py

62

It tests for both, but None is already caught earlier.

lldb/packages/Python/lldbsuite/test/builders/darwin.py

def get_triple():
     # Get the version from the SDK.
     version = lldbutil.get_xcode_sdk_version(sdk)
     if version is None:
         return None, None, None, None
 
     return vendor, os, version, env
 
 
+def get_triple_str(arch, vendor, os, version, env):
+    if None in [arch, vendor, os, version, env]:
+        return None
+
+    component = [arch, vendor, os + version]
+    if env:
+        components.append(env)
+    return '-'.join(component)
+
+
 class BuilderDarwin(Builder):
     def getTriple(self, arch):
         vendor, os, version, env = get_triple()
-        components = [arch, vendor, os, version, env]
-        if None in components:
-            return None
-        return '-'.join(components)
+        return get_triple_str(arch, vendor, os, version, env)
 
     def getExtraMakeArgs(self):
         """
         Helper function to return extra argumentsfor the make system. This
         method is meant to be overridden by platform specific builders.
         """
         args = dict()
 
def getExtraMakeArgs(self):
 
         # Return extra args as a formatted string.
         return ['{}={}'.format(key, value) for key, value in args.items()]
 
     def getArchCFlags(self, arch):
         """Returns the ARCH_CFLAGS for the make system."""
         # Get the triple components.
         vendor, os, version, env = get_triple()
-        if vendor is None or os is None or version is None or env is None:
+        triple = get_triple_str(arch, vendor, os, version, env)
+        if not triple:
             return []
 
-        # Construct the triple from its components.
-        triple = '-'.join([arch, vendor, os, version, env])
-
         # Construct min version argument
         version_min = ""
         if env == "simulator":
             version_min = "-m{}-simulator-version-min={}".format(os, version)
         else:
             version_min = "-m{}-version-min={}".format(os, version)
 
         return ["ARCH_CFLAGS=-target {} {}".format(triple, version_min)]
 
     def _getDebugInfoArgs(self, debug_info):
         if debug_info == "dsym":
             return ["MAKE_DSYM=YES"]
         return super(BuilderDarwin, self)._getDebugInfoArgs(debug_info)