aboutsummaryrefslogtreecommitdiff
path: root/devel/electron33/files/patch-build_rust_std_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron33/files/patch-build_rust_std_BUILD.gn')
-rw-r--r--devel/electron33/files/patch-build_rust_std_BUILD.gn84
1 files changed, 0 insertions, 84 deletions
diff --git a/devel/electron33/files/patch-build_rust_std_BUILD.gn b/devel/electron33/files/patch-build_rust_std_BUILD.gn
deleted file mode 100644
index 9b828f8c5b9c..000000000000
--- a/devel/electron33/files/patch-build_rust_std_BUILD.gn
+++ /dev/null
@@ -1,84 +0,0 @@
---- build/rust/std/BUILD.gn.orig 2025-01-06 14:31:29 UTC
-+++ build/rust/std/BUILD.gn
-@@ -22,29 +22,6 @@ if (toolchain_has_rust) {
- import("//build/config/sanitizers/sanitizers.gni")
-
- if (toolchain_has_rust) {
-- # If clang performs the link step, we need to provide the allocator symbols
-- # that are normally injected by rustc during linking.
-- #
-- # We also "happen to" use this to redirect allocations to PartitionAlloc,
-- # though that would be better done through a #[global_allocator] crate (see
-- # above).
-- source_set("remap_alloc") {
-- public_deps = [ "//base/allocator/partition_allocator:buildflags" ]
-- if (use_partition_alloc_as_malloc) {
-- public_deps += [ "//base/allocator/partition_allocator:partition_alloc" ]
-- }
-- sources = [
-- # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
-- # copied from `//base`.
-- # TODO(crbug.com/40279749): Avoid duplication / reuse code.
-- "alias.cc",
-- "alias.h",
-- "compiler_specific.h",
-- "immediate_crash.h",
-- "remap_alloc.cc",
-- ]
-- }
--
- # List of Rust stdlib rlibs which are present in the official Rust toolchain
- # we are using from the Android team. This is usually a version or two behind
- # nightly. Generally this matches the toolchain we build ourselves, but if
-@@ -74,13 +51,20 @@ if (toolchain_has_rust) {
- # These are no longer present in the Windows toolchain.
- stdlib_files += [
- "addr2line",
-- "adler",
- "gimli",
- "libc",
- "memchr",
- "miniz_oxide",
- "object",
- ]
-+
-+ rust_revision_pieces = string_split(rustc_revision, " ")
-+ rust_version_pieces = string_split(rust_revision_pieces[1], ".")
-+ if (rust_version_pieces[1] == "85") {
-+ stdlib_files += [ "adler" ]
-+ } else {
-+ stdlib_files += [ "adler2" ]
-+ }
- }
-
- if (toolchain_for_rust_host_build_tools) {
-@@ -100,7 +84,6 @@ if (toolchain_has_rust) {
- # don't need to pass to the C++ linker because they're used for specialized
- # purposes.
- skip_stdlib_files = [
-- "profiler_builtins",
- "rustc_std_workspace_alloc",
- "rustc_std_workspace_core",
- "rustc_std_workspace_std",
-@@ -297,8 +280,6 @@ if (toolchain_has_rust) {
- deps += [ "rules:$libname" ]
- }
- deps += rustc_sanitizer_runtimes
--
-- public_deps = [ ":remap_alloc" ]
- }
- } else {
- action("find_stdlib") {
-@@ -424,12 +405,6 @@ if (toolchain_has_rust) {
- ":stdlib_public_dependent_libs",
- ]
- deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
--
-- # The host builds tools toolchain supports Rust only and does not use
-- # the allocator remapping to point it to PartitionAlloc.
-- if (!toolchain_for_rust_host_build_tools) {
-- deps += [ ":remap_alloc" ]
-- }
- }
- }
- }