summarylogtreecommitdiffstats
path: root/init.configure.patch
blob: 0841038ef52231d2e3cc8b2b40c2b7c4862c3977 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
--- init.configure.upstream	2018-09-21 13:11:04.786186503 +0200
+++ init.configure	2018-09-21 13:13:35.415460493 +0200
@@ -591,7 +591,14 @@
     # There is also a quartet form:
     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
-    cpu, manufacturer, os = triplet.split('-', 2)
+    if triplet.count('-') == 1:
+        # Some new rust targets only have one dash and follows the form:
+        # CPU_TYPE-OPERATING_SYSTEM
+        # See: https://github.com/rust-lang/rust/pull/52763
+        manufacturer = None
+        cpu, os = triplet.split('-')
+    else:
+        cpu, manufacturer, os = triplet.split('-', 2)
 
     # Autoconf uses config.sub to validate and canonicalize those triplets,
     # but the granularity of its results has never been satisfying to our