Skip to content

Commit b887bdb

Browse files
committed
Flesh out various flags on toolchains
1 parent f11f4aa commit b887bdb

1 file changed

Lines changed: 23 additions & 6 deletions

File tree

rs/experimental/toolchains/declare_rustc_toolchains.bzl

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,48 @@ def declare_rustc_toolchains(
5151
cargo = "{}cargo".format(cargo_repo_label),
5252
clippy_driver = "{}clippy_driver_bin".format(clippy_repo_label),
5353
cargo_clippy = "{}cargo_clippy_bin".format(clippy_repo_label),
54-
# TODO(zbarsky): Enable these once we ship them.
55-
#llvm_cov = "@llvm//tools:llvm-cov",
56-
#llvm_profdata = "@llvm//tools:llvm-profdata",
54+
llvm_cov = "@llvm//tools:llvm-cov",
55+
llvm_profdata = "@llvm//tools:llvm-profdata",
5756
rustc_lib = "{}rustc_lib".format(rustc_repo_label),
5857
allocator_library = None,
5958
global_allocator_library = None,
6059
binary_ext = select({
61-
"@platforms//os:none": ".wasm",
60+
"@platforms//os:emscripten": ".js",
61+
"@platforms//os:uefi": ".efi",
6262
"@platforms//os:windows": ".exe",
63+
"@platforms//cpu:wasm32": ".wasm",
64+
"@platforms//cpu:wasm64": ".wasm",
6365
"//conditions:default": "",
6466
}),
6567
staticlib_ext = select({
6668
"@platforms//os:none": "",
69+
"@platforms//os:emscripten": ".js",
70+
"@platforms//os:uefi": ".lib",
6771
"@platforms//os:windows": ".lib",
6872
"//conditions:default": ".a",
6973
}),
7074
dylib_ext = select({
71-
"@platforms//os:none": "",
72-
"@platforms//os:windows": ".dll",
75+
"@platforms//cpu:wasm32": ".wasm",
76+
"@platforms//cpu:wasm64": ".wasm",
77+
"@platforms//os:none": ".so",
78+
"@platforms//os:android": ".so",
79+
"@platforms//os:emscripten": ".js",
80+
"@platforms//os:fuchsia": ".so",
81+
"@platforms//os:ios": ".dylib",
7382
"@platforms//os:macos": ".dylib",
83+
"@platforms//os:nixos": ".so",
84+
"@platforms//os:uefi": "", # UEFI doesn't have dynamic linking
85+
"@platforms//os:windows": ".dll",
7486
"//conditions:default": ".so",
7587
}),
7688
stdlib_linkflags = select({
89+
"@platforms//os:android": ["-ldl", "-llog"],
7790
"@platforms//os:freebsd": ["-lexecinfo", "-lpthread"],
7891
"@platforms//os:macos": ["-lSystem", "-lresolv"],
92+
"@platforms//os:netbsd": ["-lpthread", "-lrt"],
93+
"@platforms//os:nixos": ["-ldl", "-lpthread"],
94+
"@platforms//os:openbsd": ["-lpthread"],
95+
"@platforms//os:ios": ["-lSystem", "-lobjc", "-Wl,-framework,Security", "-Wl,-framework,Foundation", "-lresolv"],
7996
# TODO: windows
8097
"//conditions:default": [],
8198
}),

0 commit comments

Comments
 (0)