[Lldb-commits] [PATCH] D112676: [lldb] The os and version are not separate components in the triple

[Jonas Devlieghere via Phabricator via lldb-commits]

JDevlieghere created this revision.
JDevlieghere added a reviewer: aprantl.
JDevlieghere requested review of this revision.

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


https://reviews.llvm.org/D112676

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


Index: lldb/packages/Python/lldbsuite/test/builders/darwin.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/builders/darwin.py
+++ lldb/packages/Python/lldbsuite/test/builders/darwin.py
@@ -57,7 +57,7 @@
 class BuilderDarwin(Builder):
     def getTriple(self, arch):
         vendor, os, version, env = get_triple()
-        components = [arch, vendor, os, version, env]
+        components = [arch, vendor, os + version, env]
         if None in components:
             return None
         return '-'.join(components)
@@ -97,7 +97,7 @@
             return []
 
         # Construct the triple from its components.
-        triple = '-'.join([arch, vendor, os, version, env])
+        triple = '-'.join([arch, vendor, os + version, env])
 
         # Construct min version argument
         version_min = ""



Index: lldb/packages/Python/lldbsuite/test/builders/darwin.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/builders/darwin.py
+++ lldb/packages/Python/lldbsuite/test/builders/darwin.py
@@ -57,7 +57,7 @@
 class BuilderDarwin(Builder):
     def getTriple(self, arch):
         vendor, os, version, env = get_triple()
-        components = [arch, vendor, os, version, env]
+        components = [arch, vendor, os + version, env]
         if None in components:
             return None
         return '-'.join(components)
@@ -97,7 +97,7 @@
             return []
 
         # Construct the triple from its components.
-        triple = '-'.join([arch, vendor, os, version, env])
+        triple = '-'.join([arch, vendor, os + version, env])
 
         # Construct min version argument
         version_min = ""

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits