Skip to content

Commit e2450e9

Browse files
committed
Fix fuchsia triple
1 parent 0c6bcc8 commit e2450e9

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

rust/platform/platform.bzl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,15 @@ def declare_config_settings():
107107
":nto",
108108
],
109109
)
110+
111+
native.alias(
112+
name = "aarch64-fuchsia",
113+
actual = "aarch64-unknown-fuchsia",
114+
deprecation = "Use `@rules_rust//rust/platform:aarch64-unknown-fuchsia` instead.",
115+
)
116+
117+
native.alias(
118+
name = "x86_64-fuchsia",
119+
actual = "x86_64-unknown-fuchsia",
120+
deprecation = "Use `@rules_rust//rust/platform:x86_64-unknown-fuchsia` instead.",
121+
)

rust/platform/triple.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ def triple(triple):
2424
if triple in ("wasm32-wasi", "wasm32-wasip1"):
2525
return struct(
2626
arch = triple.split("-")[0],
27-
system = triple.split("-")[1],
2827
vendor = triple.split("-")[1],
28+
system = triple.split("-")[1],
2929
abi = None,
3030
str = triple,
3131
)
3232
elif triple in ("aarch64-fuchsia", "x86_64-fuchsia"):
3333
return struct(
3434
arch = triple.split("-")[0],
35+
vendor = "unknown",
3536
system = "fuchsia",
36-
vendor = "fuchsia",
3737
abi = None,
3838
str = triple,
3939
)

rust/platform/triple_mappings.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SUPPORTED_T1_PLATFORM_TRIPLES = {
4444
SUPPORTED_T2_PLATFORM_TRIPLES = {
4545
"aarch64-apple-ios": _support(std = True, host_tools = False),
4646
"aarch64-apple-ios-sim": _support(std = True, host_tools = False),
47-
"aarch64-fuchsia": _support(std = True, host_tools = False),
47+
"aarch64-unknown-fuchsia": _support(std = True, host_tools = False),
4848
"aarch64-linux-android": _support(std = True, host_tools = False),
4949
"aarch64-pc-windows-msvc": _support(std = True, host_tools = True),
5050
"arm-unknown-linux-gnueabi": _support(std = True, host_tools = True),
@@ -61,7 +61,7 @@ SUPPORTED_T2_PLATFORM_TRIPLES = {
6161
"wasm32-unknown-unknown": _support(std = True, host_tools = False),
6262
"wasm32-wasi": _support(std = True, host_tools = False),
6363
"x86_64-apple-ios": _support(std = True, host_tools = False),
64-
"x86_64-fuchsia": _support(std = True, host_tools = False),
64+
"x86_64-unknown-fuchsia": _support(std = True, host_tools = False),
6565
"x86_64-linux-android": _support(std = True, host_tools = False),
6666
"x86_64-unknown-freebsd": _support(std = True, host_tools = True),
6767
"x86_64-unknown-none": _support(std = True, host_tools = False),

test/unit/platform_triple/platform_triple_test.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ def _construct_known_triples_test_impl(ctx):
120120
env = unittest.begin(ctx)
121121

122122
_assert_parts(env, triple("aarch64-apple-darwin"), "aarch64", "apple", "darwin", None)
123-
_assert_parts(env, triple("aarch64-fuchsia"), "aarch64", "fuchsia", "fuchsia", None)
123+
_assert_parts(env, triple("aarch64-fuchsia"), "aarch64", "unknown", "fuchsia", None)
124124
_assert_parts(env, triple("aarch64-unknown-linux-musl"), "aarch64", "unknown", "linux", "musl")
125125
_assert_parts(env, triple("thumbv7em-none-eabi"), "thumbv7em", None, "none", "eabi")
126126
_assert_parts(env, triple("thumbv8m.main-none-eabi"), "thumbv8m.main", None, "none", "eabi")
127127
_assert_parts(env, triple("wasm32-unknown-unknown"), "wasm32", "unknown", "unknown", None)
128128
_assert_parts(env, triple("wasm32-wasi"), "wasm32", "wasi", "wasi", None)
129129
_assert_parts(env, triple("wasm32-wasip1"), "wasm32", "wasip1", "wasip1", None)
130-
_assert_parts(env, triple("x86_64-fuchsia"), "x86_64", "fuchsia", "fuchsia", None)
130+
_assert_parts(env, triple("x86_64-fuchsia"), "x86_64", "unknown", "fuchsia", None)
131131

132132
return unittest.end(env)
133133

0 commit comments

Comments
 (0)